Commit b7d9b72a authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into gw.mysql.r18.ru:/usr/home/ram/work/5.0
parents 63fdb2cc 6c064400

include/m_ctype.h

+3 −1
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ typedef struct my_collation_handler_st 
                         my_bool diff_if_only_endspace_difference);

  int     (*strnxfrm)(struct charset_info_st *,

		      uchar *, uint, const uchar *, uint);

  uint    (*strnxfrmlen)(struct charset_info_st *, uint); 

  my_bool (*like_range)(struct charset_info_st *,

			const char *s, uint s_length,

			pchar w_prefix, pchar w_one, pchar w_many,
@@ -260,6 +261,7 @@ extern CHARSET_INFO my_charset_cp1250_czech_ci; 
/* declarations for simple charsets */

extern int  my_strnxfrm_simple(CHARSET_INFO *, uchar *, uint, const uchar *,

                               uint); 

uint  my_strnxfrmlen_simple(CHARSET_INFO *, uint); 

extern int  my_strnncoll_simple(CHARSET_INFO *, const uchar *, uint,

				const uchar *, uint, my_bool);

mysql-test/include/ndb_default_cluster.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
-- require r/ndb_default_cluster.require

disable_query_log;

show status like "Ndb_connected_host";

enable_query_log;

mysql-test/r/ndb_default_cluster.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value

Ndb_connected_host	localhost

mysql-test/t/ndb_restore.test

+1 −0
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/ndb_default_cluster.inc



--disable_warnings

use test;

sql/filesort.cc

+2 −2
Original line number Diff line number Diff line
@@ -1187,7 +1187,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length, bool *multi_byte_charset) 
	{

	  sortorder->need_strxnfrm= 1;

	  *multi_byte_charset= 1;

	  sortorder->length= sortorder->length*cs->strxfrm_multiply;

          sortorder->length= cs->coll->strnxfrmlen(cs, sortorder->length);

	}

      }

      if (sortorder->field->maybe_null())
@@ -1200,7 +1200,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length, bool *multi_byte_charset) 
	sortorder->length=sortorder->item->max_length;

	if (use_strnxfrm((cs=sortorder->item->collation.collation)))

	{ 

	  sortorder->length= sortorder->length*cs->strxfrm_multiply;

          sortorder->length= cs->coll->strnxfrmlen(cs, sortorder->length);

	  sortorder->need_strxnfrm= 1;

	  *multi_byte_charset= 1;

	}