Merge bk-internal:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

56 files changed, 683 insertions, 158 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 92ed47221bd..fd8cf7ecc8b 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -664,7 +664,7 @@ static VAR* var_obtain(char* name, int len)
   if ((v = (VAR*)hash_search(&var_hash, name, len)))
     return v;
   v = var_init(0, name, len, "", 0);
-  hash_insert(&var_hash, (byte*)v);
+  my_hash_insert(&var_hash, (byte*)v);
   return v;
 }
 
@@ -2178,7 +2178,7 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
   if (!(flags & QUERY_REAP))
     DBUG_RETURN(0);
 
-  if (mysql_read_query_result(mysql) ||
+  if ((*mysql->methods->read_query_result)(mysql) ||
       (!(last_result = res = mysql_store_result(mysql)) &&
        mysql_field_count(mysql)))
   {
@@ -2400,7 +2400,7 @@ static void var_from_env(const char *name, const char *def_val)
     tmp = def_val;
 
   v = var_init(0, name, 0, tmp, 0);
-  hash_insert(&var_hash, (byte*)v);
+  my_hash_insert(&var_hash, (byte*)v);
 }
 
 
@@ -2416,9 +2416,9 @@ static void init_var_hash(MYSQL *mysql)
   var_from_env("MYSQL_TEST_DIR", "/tmp");
   var_from_env("BIG_TEST", opt_big_test ? "1" : "0");
   v= var_init(0,"MAX_TABLES", 0, (sizeof(ulong) == 4) ? "31" : "62",0);
-  hash_insert(&var_hash, (byte*) v);
+  my_hash_insert(&var_hash, (byte*) v);
   v= var_init(0,"SERVER_VERSION", 0, mysql_get_server_info(mysql), 0);
-  hash_insert(&var_hash, (byte*) v);
+  my_hash_insert(&var_hash, (byte*) v);
   
   DBUG_VOID_RETURN;
 }
diff --git a/extra/comp_err.c b/extra/comp_err.c
index 2ec4240392f..1803b93ff8c 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -70,13 +70,15 @@ int main(int argc,char *argv[])
       fclose(from);
       goto end;
     }
-    
+
+#ifdef NEEDS_FIXES
     if (!(csnum= get_charset_number(charset_name, MY_CS_PRIMARY)))
     {
       fprintf(stderr,"Unknown character '%s' in '%s'\n",charset_name, *argv);
       fclose(from);
       goto end;
     }
+#endif
     
     if (remember_rows(from,'}') < 0)	/* Remember rows */
     {
diff --git a/include/hash.h b/include/hash.h
index 6c805bc2da7..3c2ae32c70e 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -49,7 +49,7 @@ void hash_free(HASH *tree);
 byte *hash_element(HASH *hash,uint idx);
 gptr hash_search(HASH *info,const byte *key,uint length);
 gptr hash_next(HASH *info,const byte *key,uint length);
-my_bool hash_insert(HASH *info,const byte *data);
+my_bool my_hash_insert(HASH *info,const byte *data);
 my_bool hash_delete(HASH *hash,byte *record);
 my_bool hash_update(HASH *hash,byte *record,byte *old_key,uint old_key_length);
 void hash_replace(HASH *hash, uint idx, byte *new_row);
diff --git a/include/m_ctype.h b/include/m_ctype.h
index 8116058d687..603bb3cc2e5 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -115,12 +115,17 @@ typedef struct my_collation_handler_st
 
   int  (*strcasecmp)(struct charset_info_st *, const char *, const char *);
   
+  int  (*instr)(struct charset_info_st *,
+                const char *big,   uint b_length,
+                const char *small, uint s_length);
+  
   /* Hash calculation */
   void (*hash_sort)(struct charset_info_st *cs, const uchar *key, uint len,
 		    ulong *nr1, ulong *nr2); 
 } MY_COLLATION_HANDLER;
 
-extern MY_COLLATION_HANDLER my_collation_bin_handler;
+extern MY_COLLATION_HANDLER my_collation_mb_bin_handler;
+extern MY_COLLATION_HANDLER my_collation_8bit_bin_handler;
 extern MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler;
 
 
@@ -243,6 +248,10 @@ extern void my_hash_sort_simple(CHARSET_INFO *cs,
 
 extern uint my_lengthsp_8bit(CHARSET_INFO *cs, const char *ptr, uint length);
 
+extern int  my_instr_simple(struct charset_info_st *,
+                            const char *big,   uint b_length,
+                            const char *small, uint s_length);
+
 
 /* Functions for 8bit */
 extern void my_caseup_str_8bit(CHARSET_INFO *, char *);
@@ -307,6 +316,9 @@ int my_wildcmp_mb(CHARSET_INFO *,
 		  int escape, int w_one, int w_many);
 uint my_numchars_mb(CHARSET_INFO *, const char *b, const char *e);
 uint my_charpos_mb(CHARSET_INFO *, const char *b, const char *e, uint pos);
+int  my_instr_mb(struct charset_info_st *,
+                 const char *big,   uint b_length,
+                 const char *small, uint s_length);
 
 
 extern my_bool my_parse_charset_xml(const char *bug, uint len,
diff --git a/include/mysql.h b/include/mysql.h
index a2da4f353f7..2e9147894ca 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -359,6 +359,7 @@ int		STDCALL mysql_send_query(MYSQL *mysql, const char *q,
 int		STDCALL mysql_real_query(MYSQL *mysql, const char *q,
 					unsigned long length);
 MYSQL_RES *     STDCALL mysql_store_result(MYSQL *mysql);
+MYSQL_RES *     STDCALL mysql_use_result(MYSQL *mysql);
 
 /* perform query on master */
 my_bool		STDCALL mysql_master_query(MYSQL *mysql, const char *q,
@@ -460,6 +461,7 @@ int             STDCALL mysql_manager_command(MYSQL_MANAGER* con,
 int             STDCALL mysql_manager_fetch_line(MYSQL_MANAGER* con,
 						  char* res_buf,
 						 int res_buf_size);
+my_bool         STDCALL mysql_read_query_result(MYSQL *mysql);
 
 
 /*
@@ -540,9 +542,6 @@ typedef struct st_mysql_stmt
 } MYSQL_STMT;
 
 
-#define mysql_read_query_result(mysql) (*(mysql)->methods->read_query_result)(mysql)
-#define mysql_use_result(mysql) (*(mysql)->methods->use_result)(mysql)
-
 typedef struct st_mysql_methods
 {
   my_bool (STDCALL *read_query_result)(MYSQL *mysql);
@@ -554,14 +553,17 @@ typedef struct st_mysql_methods
 				      unsigned long arg_length,
 				      my_bool skip_check);
   MYSQL_DATA *(STDCALL *read_rows)(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
-				   uint fields);
+				   unsigned int fields);
   MYSQL_RES * (STDCALL *use_result)(MYSQL *mysql);
   void (STDCALL *fetch_lengths)(unsigned long *to, 
-				MYSQL_ROW column, uint field_count);
+				MYSQL_ROW column, unsigned int field_count);
+#if !defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY)
   MYSQL_FIELD * (STDCALL *list_fields)(MYSQL *mysql);
   my_bool (STDCALL *read_prepare_result)(MYSQL *mysql, MYSQL_STMT *stmt);
   int (STDCALL *stmt_execute)(MYSQL_STMT *stmt);
   MYSQL_DATA *(STDCALL *read_binary_rows)(MYSQL_STMT *stmt);
+  int (STDCALL *unbuffered_fetch)(MYSQL *mysql, char **row);
+#endif
 
 } MYSQL_METHODS;
 
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 4d2b9d7cdce..d5a70e4dfe8 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -245,7 +245,7 @@ my_bool net_realloc(NET *net, unsigned long length);
 #ifndef EMBEDDED_LIBRARY /* To be removed by HF */
 my_bool	net_flush(NET *net);
 #else
-#define net_flush(A) ((my_bool)0)
+#define net_flush(A)
 #endif
 
 my_bool	my_net_write(NET *net,const char *packet,unsigned long len);
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h
index 4fdbab08969..d0432503ee9 100644
--- a/libmysql/client_settings.h
+++ b/libmysql/client_settings.h
@@ -56,3 +56,4 @@ MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
 			  uint fields);
 int STDCALL cli_stmt_execute(MYSQL_STMT *stmt);
 MYSQL_DATA *cli_read_binary_rows(MYSQL_STMT *stmt);
+int STDCALL cli_unbuffered_fetch(MYSQL *mysql, char **row);
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 954eae89a2b..debe3e54679 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -279,7 +279,7 @@ my_bool STDCALL mysql_master_query(MYSQL *mysql, const char *q,
   DBUG_ENTER("mysql_master_query");
   if (mysql_master_send_query(mysql, q, length))
     DBUG_RETURN(1);
-  DBUG_RETURN(mysql_read_query_result(mysql));
+  DBUG_RETURN((*mysql->methods->read_query_result)(mysql));
 }
 
 my_bool STDCALL mysql_master_send_query(MYSQL *mysql, const char *q,
@@ -301,7 +301,7 @@ my_bool STDCALL mysql_slave_query(MYSQL *mysql, const char *q,
   DBUG_ENTER("mysql_slave_query");
   if (mysql_slave_send_query(mysql, q, length))
     DBUG_RETURN(1);
-  DBUG_RETURN(mysql_read_query_result(mysql));
+  DBUG_RETURN((*mysql->methods->read_query_result)(mysql));
 }
 
 
@@ -1982,7 +1982,7 @@ static my_bool execute(MYSQL_STMT * stmt, char *packet, ulong length)
   if (cli_advanced_command(mysql, COM_EXECUTE, buff, 
 			    MYSQL_STMT_HEADER, packet, 
 			    length, 1) ||
-      mysql_read_query_result(mysql))
+      (*mysql->methods->read_query_result)(mysql))
   {
     set_stmt_errmsg(stmt, net->last_error, net->last_errno, net->sqlstate);
     DBUG_RETURN(1);
@@ -2965,6 +2965,14 @@ static int stmt_fetch_row(MYSQL_STMT *stmt, uchar *row)
   return 0;
 }
 
+int STDCALL cli_unbuffered_fetch(MYSQL *mysql, char **row)
+{
+  if (packet_error == net_safe_read(mysql))
+    return 1;
+
+  *row= (mysql->net.read_pos[0] == 254) ? NULL : (mysql->net.read_pos+1);
+  return 0;
+}
 
 /*
   Fetch and return row data to bound buffers, if any
@@ -2994,20 +3002,20 @@ int STDCALL mysql_fetch(MYSQL_STMT *stmt)
   }
   else						/* un-buffered */
   {
-    if (packet_error == net_safe_read(mysql))
+    if((*mysql->methods->unbuffered_fetch)(mysql, ( char **)&row))
     {
       set_stmt_errmsg(stmt, mysql->net.last_error, mysql->net.last_errno,
 		      mysql->net.sqlstate);
       DBUG_RETURN(1);
     }
-    if (mysql->net.read_pos[0] == 254)
+    if (!row)
     {
       mysql->status= MYSQL_STATUS_READY;
       stmt->current_row= 0;
       goto no_data;
     }
-    row= mysql->net.read_pos+1;  
-  }  
+  }
+
   stmt->current_row= row;    
   DBUG_RETURN(stmt_fetch_row(stmt, row));
 
@@ -3480,7 +3488,18 @@ my_bool STDCALL mysql_next_result(MYSQL *mysql)
   mysql->affected_rows= ~(my_ulonglong) 0;
 
   if (mysql->last_used_con->server_status & SERVER_MORE_RESULTS_EXISTS)
-    DBUG_RETURN(mysql_read_query_result(mysql));
+    DBUG_RETURN((*mysql->methods->read_query_result)(mysql));
   
   DBUG_RETURN(0);
 }
+
+MYSQL_RES * STDCALL mysql_use_result(MYSQL *mysql)
+{
+  return (*mysql->methods->use_result)(mysql);
+}
+
+my_bool STDCALL mysql_read_query_result(MYSQL *mysql)
+{
+  return (*mysql->methods->read_query_result)(mysql);
+}
+
diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h
index 833cc1b1f80..75461bbfbe0 100644
--- a/libmysqld/embedded_priv.h
+++ b/libmysqld/embedded_priv.h
@@ -26,6 +26,7 @@ C_MODE_START
 extern void lib_connection_phase(NET *net, int phase);
 extern void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db);
 extern void *create_embedded_thd(int client_flag, char *db);
+extern void free_embedded_thd(MYSQL *mysql);
 extern MYSQL_METHODS embedded_methods;
 void free_old_query(MYSQL *mysql);
 extern my_bool server_inited;
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 6b099158ae0..179bbaeec91 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -102,7 +102,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
 
 static MYSQL_DATA * STDCALL 
 emb_read_rows(MYSQL *mysql, MYSQL_FIELD *mysql_fields __attribute__((unused)),
-	      uint fields __attribute__((unused)))
+	      unsigned int fields __attribute__((unused)))
 {
   MYSQL_DATA *result= ((THD*)mysql->thd)->data;
   if (!result)
@@ -154,7 +154,7 @@ static my_bool STDCALL emb_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
   else the lengths are calculated from the offset between pointers.
 **************************************************************************/
 
-static void STDCALL emb_fetch_lengths(ulong *to, MYSQL_ROW column, uint field_count)
+static void STDCALL emb_fetch_lengths(ulong *to, MYSQL_ROW column, unsigned int field_count)
 { 
   MYSQL_ROW end;
 
@@ -195,6 +195,26 @@ MYSQL_DATA *emb_read_binary_rows(MYSQL_STMT *stmt)
   return emb_read_rows(stmt->mysql, 0, 0);
 }
 
+int STDCALL emb_unbuffered_fetch(MYSQL *mysql, char **row)
+{
+  MYSQL_DATA *data= ((THD*)mysql->thd)->data;
+  if (!data || !data->data)
+  {
+    *row= NULL;
+    if (data)
+    {
+      free_rows(data);
+      ((THD*)mysql->thd)->data= NULL;
+    }
+  }
+  else
+  {
+    *row= (char *)data->data->data;
+    data->data= data->data->next;
+  }
+  return 0;
+}
+
 MYSQL_METHODS embedded_methods= 
 {
   emb_mysql_read_query_result,
@@ -205,7 +225,8 @@ MYSQL_METHODS embedded_methods=
   emb_list_fields,
   emb_read_prepare_result,
   emb_stmt_execute,
-  emb_read_binary_rows
+  emb_read_binary_rows,
+  emb_unbuffered_fetch
 };
 
 C_MODE_END
@@ -453,6 +474,16 @@ void *create_embedded_thd(int client_flag, char *db)
   return thd;
 }
 
+void free_embedded_thd(MYSQL *mysql)
+{
+  THD *thd= (THD*)mysql->thd;
+  if (!thd)
+    return;
+  if (thd->data)
+    free_rows(thd->data);
+  delete thd;
+}
+
 C_MODE_END
 
 bool Protocol::send_fields(List<Item> *list, uint flag)
@@ -561,9 +592,8 @@ bool Protocol_prep::write()
 
   *data->prev_ptr= cur;
   data->prev_ptr= &cur->next;
-  next_field=cur->data;
-  next_mysql_field= thd->mysql->fields;
-
+  cur->next= 0;
+  
   return false;
 }
 
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index 67dc00e4c1b..ddde18c1918 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -221,7 +221,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
 	goto error;
       if (mysql->fields)
       {
-	if (!(res= mysql_use_result(mysql)))
+	if (!(res= (*mysql->methods->use_result)(mysql)))
 	  goto error;
 	mysql_free_result(res);
       }
@@ -289,6 +289,9 @@ void STDCALL mysql_close(MYSQL *mysql)
 #endif /* HAVE_OPENSSL */
     if (mysql->free_me)
       my_free((gptr) mysql,MYF(0));
+    
+    free_embedded_thd(mysql);
+
   }
   DBUG_VOID_RETURN;
 }
diff --git a/mysql-test/r/ctype_ujis.result b/mysql-test/r/ctype_ujis.result
index ffb305a81cf..1730b17eaed 100644
--- a/mysql-test/r/ctype_ujis.result
+++ b/mysql-test/r/ctype_ujis.result
@@ -1,4 +1,5 @@
 drop table if exists t1;
+set names ujis;
 create table t1 (c text character set ujis);
 insert into t1 values (0xa4a2),(0xa4a3);
 select hex(left(c,1)) from t1 group by c;
@@ -6,3 +7,60 @@ hex(left(c,1))
 A4A2
 A4A3
 drop table t1;
+select locate(0xa2a1,0xa1a2a1a3);
+locate(0xa2a1,0xa1a2a1a3)
+2
+select locate(_ujis 0xa2a1,_ujis 0xa1a2a1a3);
+locate(_ujis 0xa2a1,_ujis 0xa1a2a1a3)
+0
+select locate(_ujis 0xa2a1,_ujis 0xa1a2a1a3 collate ujis_bin);
+locate(_ujis 0xa2a1,_ujis 0xa1a2a1a3 collate ujis_bin)
+0
+select locate('he','hello');
+locate('he','hello')
+1
+select locate('he','hello',2);
+locate('he','hello',2)
+0
+select locate('lo','hello',2);
+locate('lo','hello',2)
+4
+select locate('HE','hello');
+locate('HE','hello')
+1
+select locate('HE','hello',2);
+locate('HE','hello',2)
+0
+select locate('LO','hello',2);
+locate('LO','hello',2)
+4
+select locate('HE','hello' collate ujis_bin);
+locate('HE','hello' collate ujis_bin)
+0
+select locate('HE','hello' collate ujis_bin,2);
+locate('HE','hello' collate ujis_bin,2)
+0
+select locate('LO','hello' collate ujis_bin,2);
+locate('LO','hello' collate ujis_bin,2)
+0
+select locate(_ujis 0xa1a3,_ujis 0xa1a2a1a3);
+locate(_ujis 0xa1a3,_ujis 0xa1a2a1a3)
+2
+select 0xa1a2a1a3 like concat(_binary'%',0xa2a1,_binary'%');
+0xa1a2a1a3 like concat(_binary'%',0xa2a1,_binary'%')
+1
+select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%');
+_ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%')
+0
+select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%') collate ujis_bin;
+_ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%') collate ujis_bin
+0
+select 'a' like 'a';
+'a' like 'a'
+1
+select 'A' like 'a';
+'A' like 'a'
+1
+select 'A' like 'a' collate ujis_bin;
+'A' like 'a' collate ujis_bin
+0
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
new file mode 100644
index 00000000000..1f07de17b14
--- /dev/null
+++ b/mysql-test/r/ctype_utf8.result
@@ -0,0 +1,61 @@
+set names utf8;
+select left(_utf8 0xD0B0D0B1D0B2,1);
+left(_utf8 0xD0B0D0B1D0B2,1)
+а
+select right(_utf8 0xD0B0D0B2D0B2,1);
+right(_utf8 0xD0B0D0B2D0B2,1)
+в
+select locate('he','hello');
+locate('he','hello')
+1
+select locate('he','hello',2);
+locate('he','hello',2)
+0
+select locate('lo','hello',2);
+locate('lo','hello',2)
+4
+select locate('HE','hello');
+locate('HE','hello')
+1
+select locate('HE','hello',2);
+locate('HE','hello',2)
+0
+select locate('LO','hello',2);
+locate('LO','hello',2)
+4
+select locate('HE','hello' collate utf8_bin);
+locate('HE','hello' collate utf8_bin)
+0
+select locate('HE','hello' collate utf8_bin,2);
+locate('HE','hello' collate utf8_bin,2)
+0
+select locate('LO','hello' collate utf8_bin,2);
+locate('LO','hello' collate utf8_bin,2)
+0
+select locate(_utf8 0xD0B1, _utf8 0xD0B0D0B1D0B2);
+locate(_utf8 0xD0B1, _utf8 0xD0B0D0B1D0B2)
+2
+select locate(_utf8 0xD091, _utf8 0xD0B0D0B1D0B2);
+locate(_utf8 0xD091, _utf8 0xD0B0D0B1D0B2)
+2
+select locate(_utf8 0xD0B1, _utf8 0xD0B0D091D0B2);
+locate(_utf8 0xD0B1, _utf8 0xD0B0D091D0B2)
+2
+select locate(_utf8 0xD091, _utf8 0xD0B0D0B1D0B2 collate utf8_bin);
+locate(_utf8 0xD091, _utf8 0xD0B0D0B1D0B2 collate utf8_bin)
+0
+select locate(_utf8 0xD0B1, _utf8 0xD0B0D091D0B2 collate utf8_bin);
+locate(_utf8 0xD0B1, _utf8 0xD0B0D091D0B2 collate utf8_bin)
+0
+select 'a' like 'a';
+'a' like 'a'
+1
+select 'A' like 'a';
+'A' like 'a'
+1
+select 'A' like 'a' collate utf8_bin;
+'A' like 'a' collate utf8_bin
+0
+select _utf8 0xD0B0D0B1D0B2 like concat(_utf8'%',_utf8 0xD0B1,_utf8 '%');
+_utf8 0xD0B0D0B1D0B2 like concat(_utf8'%',_utf8 0xD0B1,_utf8 '%')
+1
diff --git a/mysql-test/r/have_ujis.require b/mysql-test/r/have_ujis.require
index b4de2234ec7..43a309ad74e 100644
--- a/mysql-test/r/have_ujis.require
+++ b/mysql-test/r/have_ujis.require
@@ -1,2 +1,2 @@
 Collation	Charset	Id	Default	Compiled	Sortlen
-ujis_japanese_ci	ujis	12	Yes	Yes	0
+ujis_japanese_ci	ujis	12	Yes	Yes	1
diff --git a/mysql-test/t/ctype_ujis.test b/mysql-test/t/ctype_ujis.test
index e41caf55948..bcf6507b4c7 100644
--- a/mysql-test/t/ctype_ujis.test
+++ b/mysql-test/t/ctype_ujis.test
@@ -7,6 +7,8 @@
 drop table if exists t1;
 --enable_warnings
 
+set names ujis;
+
 #
 # Test problem with LEFT()
 #
@@ -15,3 +17,27 @@ create table t1 (c text character set ujis);
 insert into t1 values (0xa4a2),(0xa4a3);
 select hex(left(c,1)) from t1 group by c;
 drop table t1;
+
+#
+#
+#
+select locate(0xa2a1,0xa1a2a1a3);
+select locate(_ujis 0xa2a1,_ujis 0xa1a2a1a3);
+select locate(_ujis 0xa2a1,_ujis 0xa1a2a1a3 collate ujis_bin);
+select locate('he','hello');
+select locate('he','hello',2);
+select locate('lo','hello',2);
+select locate('HE','hello');
+select locate('HE','hello',2);
+select locate('LO','hello',2);
+select locate('HE','hello' collate ujis_bin);
+select locate('HE','hello' collate ujis_bin,2);
+select locate('LO','hello' collate ujis_bin,2);
+select locate(_ujis 0xa1a3,_ujis 0xa1a2a1a3);
+
+select 0xa1a2a1a3 like concat(_binary'%',0xa2a1,_binary'%');
+select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%');
+select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%') collate ujis_bin;
+select 'a' like 'a';
+select 'A' like 'a';
+select 'A' like 'a' collate ujis_bin;
diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test
new file mode 100644
index 00000000000..46359e84f1d
--- /dev/null
+++ b/mysql-test/t/ctype_utf8.test
@@ -0,0 +1,35 @@
+#
+# Tests with the utf8 character set
+#
+
+set names utf8;
+
+select left(_utf8 0xD0B0D0B1D0B2,1);
+select right(_utf8 0xD0B0D0B2D0B2,1);
+
+select locate('he','hello');
+select locate('he','hello',2);
+select locate('lo','hello',2);
+select locate('HE','hello');
+select locate('HE','hello',2);
+select locate('LO','hello',2);
+select locate('HE','hello' collate utf8_bin);
+select locate('HE','hello' collate utf8_bin,2);
+select locate('LO','hello' collate utf8_bin,2);
+
+select locate(_utf8 0xD0B1, _utf8 0xD0B0D0B1D0B2);
+select locate(_utf8 0xD091, _utf8 0xD0B0D0B1D0B2);
+select locate(_utf8 0xD0B1, _utf8 0xD0B0D091D0B2);
+select locate(_utf8 0xD091, _utf8 0xD0B0D0B1D0B2 collate utf8_bin);
+select locate(_utf8 0xD0B1, _utf8 0xD0B0D091D0B2 collate utf8_bin);
+
+select 'a' like 'a';
+select 'A' like 'a';
+select 'A' like 'a' collate utf8_bin;
+select _utf8 0xD0B0D0B1D0B2 like concat(_utf8'%',_utf8 0xD0B1,_utf8 '%');
+
+#
+# Fix this, it should return 1:
+#
+#select _utf8 0xD0B0D0B1D0B2 like concat(_utf8'%',_utf8 0xD091,_utf8 '%');
+#
diff --git a/mysys/charset.c b/mysys/charset.c
index 58ce8f5b2fe..e8406173b33 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -119,7 +119,7 @@ static void simple_cs_init_functions(CHARSET_INFO *cs)
   
   if (cs->state & MY_CS_BINSORT)
   {
-    cs->coll= &my_collation_bin_handler;
+    cs->coll= &my_collation_8bit_bin_handler;
   }
   else
   {
diff --git a/mysys/hash.c b/mysys/hash.c
index 0b2dbc484bc..b0ddbd90794 100644
--- a/mysys/hash.c
+++ b/mysys/hash.c
@@ -217,7 +217,7 @@ static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length)
 
 	/* Write a hash-key to the hash-index */
 
-my_bool hash_insert(HASH *info,const byte *record)
+my_bool my_hash_insert(HASH *info,const byte *record)
 {
   int flag;
   uint halfbuff,hash_nr,first_index,idx;
diff --git a/mysys/testhash.c b/mysys/testhash.c
index a1d14dc225d..72badffdbcd 100644
--- a/mysys/testhash.c
+++ b/mysys/testhash.c
@@ -83,7 +83,7 @@ static int do_test()
     n1=rnd(1000); n2=rnd(100); n3=rnd(min(recant*5,MAX_RECORDS));
     record= (char*) my_malloc(reclength,MYF(MY_FAE));
     sprintf(record,"%6d:%4d:%8d:Pos: %4d      ",n1,n2,n3,write_count);
-    if (hash_insert(&hash,record))
+    if (my_hash_insert(&hash,record))
     {
       printf("Error: %d in write at record: %d\n",my_errno,i);
       goto err;
@@ -199,7 +199,7 @@ static int do_test()
     record=(byte*) my_malloc(reclength,MYF(MY_FAE));
     memcpy(record,recpos,reclength);
     record[reclength-1]=rnd(5)+1;
-    if (hash_insert(&hash2,record))
+    if (my_hash_insert(&hash2,record))
     {
       printf("Got error when inserting record: %*s",reclength,record);
       goto err;
diff --git a/sql-common/client.c b/sql-common/client.c
index 508ebef2e1e..cd3763da725 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1008,7 +1008,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
   else the lengths are calculated from the offset between pointers.
 **************************************************************************/
 
-static void STDCALL cli_fetch_lengths(ulong *to, MYSQL_ROW column, uint field_count)
+static void STDCALL cli_fetch_lengths(ulong *to, MYSQL_ROW column, unsigned int field_count)
 { 
   ulong *prev_length;
   byte *start=0;
@@ -1140,7 +1140,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
 /* Read all rows (fields or data) from server */
 
 MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
-			  uint fields)
+			  unsigned int fields)
 {
   uint	field;
   ulong pkt_len;
@@ -1405,11 +1405,14 @@ static MYSQL_METHODS client_methods=
   cli_advanced_command,
   cli_read_rows,
   cli_mysql_use_result,
-  cli_fetch_lengths,
-  cli_list_fields,
+  cli_fetch_lengths
+#ifndef MYSQL_SERVER
+  ,cli_list_fields,
   cli_read_prepare_result,
   cli_stmt_execute,
-  cli_read_binary_rows
+  cli_read_binary_rows,
+  cli_unbuffered_fetch
+#endif
 };
 
 MYSQL * STDCALL 
@@ -1998,7 +2001,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
 	goto error;
       if (mysql->fields)
       {
-	if (!(res= mysql_use_result(mysql)))
+	if (!(res= cli_mysql_use_result(mysql)))
 	  goto error;
 	mysql_free_result(res);
       }
@@ -2217,7 +2220,7 @@ static my_bool STDCALL cli_mysql_read_query_result(MYSQL *mysql)
   ulong field_count;
   MYSQL_DATA *fields;
   ulong length;
-  DBUG_ENTER("mysql_read_query_result");
+  DBUG_ENTER("cli_mysql_read_query_result");
 
   /*
     Read from the connection which we actually used, which
@@ -2320,7 +2323,7 @@ mysql_real_query(MYSQL *mysql, const char *query, ulong length)
 
   if (mysql_send_query(mysql,query,length))
     DBUG_RETURN(1);
-  DBUG_RETURN((int) mysql_read_query_result(mysql));
+  DBUG_RETURN((int) (*mysql->methods->read_query_result)(mysql));
 }
 
 
@@ -2389,7 +2392,7 @@ MYSQL_RES * STDCALL mysql_store_result(MYSQL *mysql)
 static MYSQL_RES * STDCALL cli_mysql_use_result(MYSQL *mysql)
 {
   MYSQL_RES *result;
-  DBUG_ENTER("mysql_use_result");
+  DBUG_ENTER("cli_mysql_use_result");
 
   mysql = mysql->last_used_con;
 
diff --git a/sql/client_settings.h b/sql/client_settings.h
index c345021d7f5..b357e52ec9d 100644
--- a/sql/client_settings.h
+++ b/sql/client_settings.h
@@ -32,8 +32,3 @@
 #undef HAVE_SMEM
 #undef _CUSTOMCONFIG_
 
-#define cli_list_fields NULL
-#define cli_read_prepare_result NULL
-#define cli_stmt_execute NULL
-#define cli_read_binary_rows NULL
-
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index ee1b54e5745..34915a6020c 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -2266,7 +2266,7 @@ static BDB_SHARE *get_share(const char *table_name, TABLE *table)
       strmov(share->table_name,table_name);
       share->key_file = key_file;
       share->key_type = key_type;
-      if (hash_insert(&bdb_open_tables, (byte*) share))
+      if (my_hash_insert(&bdb_open_tables, (byte*) share))
       {
 	pthread_mutex_unlock(&bdb_mutex); /* purecov: inspected */
 	my_free((gptr) share,0); /* purecov: inspected */
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index bc014c621fd..4ff5aba4a32 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -4583,7 +4583,7 @@ static INNOBASE_SHARE *get_share(const char *table_name)
       share->table_name_length=length;
       share->table_name=(char*) (share+1);
       strmov(share->table_name,table_name);
-      if (hash_insert(&innobase_open_tables, (mysql_byte*) share))
+      if (my_hash_insert(&innobase_open_tables, (mysql_byte*) share))
       {
 	pthread_mutex_unlock(&innobase_mutex);
 	my_free((gptr) share,0);
diff --git a/sql/hash_filo.h b/sql/hash_filo.h
index 92cd2658967..d1672e1a60c 100644
--- a/sql/hash_filo.h
+++ b/sql/hash_filo.h
@@ -116,7 +116,7 @@ public:
       last_link=last_link->prev_used;
       hash_delete(&cache,(byte*) tmp);
     }
-    if (hash_insert(&cache,(byte*) entry))
+    if (my_hash_insert(&cache,(byte*) entry))
     {
       if (free_element)
 	(*free_element)(entry);		// This should never happen
diff --git a/sql/item_func.cc b/sql/item_func.cc
index fe419745b60..125f87aecec 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1153,7 +1153,6 @@ longlong Item_func_locate::val_int()
 {
   String *a=args[0]->val_str(&value1);
   String *b=args[1]->val_str(&value2);
-  bool binary_cmp= (cmp_collation.collation->state & MY_CS_BINSORT) ? 1 : 0;
   if (!a || !b)
   {
     null_value=1;
@@ -1161,55 +1160,26 @@ longlong Item_func_locate::val_int()
   }
   null_value=0;
   uint start=0;
-#ifdef USE_MB
   uint start0=0;
-#endif
+  int  ind;
+
   if (arg_count == 3)
   {
-    start=(uint) args[2]->val_int()-1;
-#ifdef USE_MB
-    if (use_mb(cmp_collation.collation))
-    {
-      start0=start;
-      if (!binary_cmp)
-        start=a->charpos(start);
-    }
-#endif
+    start0= start =(uint) args[2]->val_int()-1;
+    start=a->charpos(start);
+    
     if (start > a->length() || start+b->length() > a->length())
       return 0;
   }
+
   if (!b->length())				// Found empty string at start
     return (longlong) (start+1);
-#ifdef USE_MB
-  if (use_mb(cmp_collation.collation) && !binary_cmp)
-  {
-    const char *ptr=a->ptr()+start;
-    const char *search=b->ptr();
-    const char *strend = ptr+a->length();
-    const char *end=strend-b->length()+1;
-    const char *search_end=search+b->length();
-    register  uint32 l;
-    while (ptr < end)
-    {
-      if (*ptr == *search)
-      {
-        register char *i,*j;
-        i=(char*) ptr+1; j=(char*) search+1;
-        while (j != search_end)
-          if (*i++ != *j++) goto skipp;
-        return (longlong) start0+1;
-      }
-  skipp:
-      if ((l=my_ismbchar(cmp_collation.collation,ptr,strend)))
-	ptr+=l;
-      else ++ptr;
-      ++start0;
-    }
-    return 0;
-  }
-#endif /* USE_MB */
-  return (longlong) (binary_cmp ? a->strstr(*b,start) :
-		     (a->strstr_case(*b,start)))+1;
+  
+  ind= cmp_collation.collation->coll->instr(cmp_collation.collation,
+                                            a->ptr()+start, a->length()-start,
+                                            b->ptr(), b->length());
+
+  return (longlong) (ind >= 0 ? ind + start0 + 1 : ind + 1);
 }
 
 
@@ -1742,7 +1712,7 @@ public:
     pthread_cond_init(&cond,NULL);
     if (key)
     {
-      if (hash_insert(&hash_user_locks,(byte*) this))
+      if (my_hash_insert(&hash_user_locks,(byte*) this))
       {
 	my_free((gptr) key,MYF(0));
 	key=0;
@@ -2103,7 +2073,7 @@ static user_var_entry *get_variable(HASH *hash, LEX_STRING &name,
     entry->used_query_id=current_thd->query_id;
     entry->type=STRING_RESULT;
     memcpy(entry->name.str, name.str, name.length+1);
-    if (hash_insert(hash,(byte*) entry))
+    if (my_hash_insert(hash,(byte*) entry))
     {
       my_free((char*) entry,MYF(0));
       return 0;
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index c4ad7f1e1e2..bde1deea46e 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -34,7 +34,7 @@
 #include "sha1.h"
 #include "my_aes.h"
 
-String empty_string("",default_charset_info);
+String my_empty_string("",default_charset_info);
 
 static void my_coll_agg_error(DTCollation &c1, DTCollation &c2, const char *fname)
 {
@@ -359,7 +359,7 @@ String *Item_func_des_encrypt::val_str(String *str)
   if ((null_value=args[0]->null_value))
     return 0;
   if ((res_length=res->length()) == 0)
-    return &empty_string;
+    return &my_empty_string;
 
   if (arg_count == 1)
   {
@@ -520,7 +520,7 @@ String *Item_func_concat_ws::val_str(String *str)
     if ((res= args[i]->val_str(str)))
       break;
   if (i ==  arg_count)
-    return &empty_string;
+    return &my_empty_string;
 
   for (i++; i < arg_count ; i++)
   {
@@ -661,7 +661,7 @@ String *Item_func_reverse::val_str(String *str)
     return 0;
   /* An empty string is a special case as the string pointer may be null */
   if (!res->length())
-    return &empty_string;
+    return &my_empty_string;
   res=copy_if_not_alloced(str,res,res->length());
   ptr = (char *) res->ptr();
   end=ptr+res->length();
@@ -914,7 +914,7 @@ String *Item_func_left::val_str(String *str)
   if ((null_value=args[0]->null_value))
     return 0;
   if (length <= 0)
-    return &empty_string;
+    return &my_empty_string;
   length= res->charpos(length);
   if (res->length() > (ulong) length)
   {						// Safe even if const arg
@@ -958,7 +958,7 @@ String *Item_func_right::val_str(String *str)
   if ((null_value=args[0]->null_value))
     return 0; /* purecov: inspected */
   if (length <= 0)
-    return &empty_string; /* purecov: inspected */
+    return &my_empty_string; /* purecov: inspected */
   if (res->length() <= (uint) length)
     return res; /* purecov: inspected */
 
@@ -991,7 +991,7 @@ String *Item_func_substr::val_str(String *str)
   start=res->charpos(start);
   length=res->charpos(length,start);
   if (start < 0 || (uint) start+1 > res->length() || length <= 0)
-    return &empty_string;
+    return &my_empty_string;
 
   tmp_length=(int32) res->length()-start;
   length=min(length,tmp_length);
@@ -1051,7 +1051,7 @@ String *Item_func_substr_index::val_str(String *str)
   null_value=0;
   uint delimeter_length=delimeter->length();
   if (!res->length() || !delimeter_length || !count)
-    return &empty_string;		// Wrong parameters
+    return &my_empty_string;		// Wrong parameters
 
   res->set_charset(collation.collation);
 
@@ -1335,7 +1335,7 @@ String *Item_func_password::val_str(String *str)
   if ((null_value=args[0]->null_value))
     return 0;
   if (res->length() == 0)
-    return &empty_string;
+    return &my_empty_string;
   make_scrambled_password(tmp_value, res->c_ptr());
   str->set(tmp_value, SCRAMBLED_PASSWORD_CHAR_LENGTH, res->charset());
   return str;
@@ -1357,7 +1357,7 @@ String *Item_func_old_password::val_str(String *str)
   if ((null_value=args[0]->null_value))
     return 0;
   if (res->length() == 0)
-    return &empty_string;
+    return &my_empty_string;
   make_scrambled_password_323(tmp_value, res->c_ptr());
   str->set(tmp_value, SCRAMBLED_PASSWORD_CHAR_LENGTH_323, res->charset());
   return str;
@@ -1383,7 +1383,7 @@ String *Item_func_encrypt::val_str(String *str)
   if ((null_value=args[0]->null_value))
     return 0;
   if (res->length() == 0)
-    return &empty_string;
+    return &my_empty_string;
 
   if (arg_count == 1)
   {					// generate random salt
@@ -1473,7 +1473,7 @@ String *Item_func_user::val_str(String *str)
 
   // For system threads (e.g. replication SQL thread) user may be empty
   if (!thd->user)
-    return &empty_string;
+    return &my_empty_string;
   res_length= (strlen(thd->user)+strlen(host)+2) * cs->mbmaxlen;
 
   if (str->alloc(res_length))
@@ -1536,7 +1536,7 @@ String *Item_func_soundex::val_str(String *str)
   while (from != end && my_isspace(cs,*from)) // Skip pre-space
     from++; /* purecov: inspected */
   if (from == end)
-    return &empty_string;		// No alpha characters.
+    return &my_empty_string;		// No alpha characters.
   *to++ = my_toupper(cs,*from);		// Copy first letter
   last_ch = get_scode(cs,from);		// code of the first letter
 					// for the first 'double-letter check.
@@ -1718,7 +1718,7 @@ String *Item_func_make_set::val_str(String *str)
   ulonglong bits;
   bool first_found=0;
   Item **ptr=args;
-  String *result=&empty_string;
+  String *result=&my_empty_string;
 
   bits=item->val_int();
   if ((null_value=item->null_value))
@@ -1742,7 +1742,7 @@ String *Item_func_make_set::val_str(String *str)
 	  else
 	  {
 	    if (tmp_str.copy(*res))		// Don't use 'str'
-	      return &empty_string;
+	      return &my_empty_string;
 	    result= &tmp_str;
 	  }
 	}
@@ -1752,11 +1752,11 @@ String *Item_func_make_set::val_str(String *str)
 	  {					// Copy data to tmp_str
 	    if (tmp_str.alloc(result->length()+res->length()+1) ||
 		tmp_str.copy(*result))
-	      return &empty_string;
+	      return &my_empty_string;
 	    result= &tmp_str;
 	  }
 	  if (tmp_str.append(',') || tmp_str.append(*res))
-	    return &empty_string;
+	    return &my_empty_string;
 	}
       }
     }
@@ -1853,7 +1853,7 @@ String *Item_func_repeat::val_str(String *str)
     goto err;				// string and/or delim are null
   null_value=0;
   if (count <= 0)			// For nicer SQL code
-    return &empty_string;
+    return &my_empty_string;
   if (count == 1)			// To avoid reallocs
     return res;
   length=res->length();
@@ -2050,7 +2050,7 @@ String *Item_func_conv::val_str(String *str)
     dec= (longlong) my_strntoull(res->charset(),res->ptr(),res->length(),from_base,&endptr,&err);
   ptr= longlong2str(dec,ans,to_base);
   if (str->copy(ans,(uint32) (ptr-ans), default_charset()))
-    return &empty_string;
+    return &my_empty_string;
   return str;
 }
 
@@ -2240,7 +2240,7 @@ String *Item_func_hex::val_str(String *str)
       return 0;
     ptr= longlong2str(dec,ans,16);
     if (str->copy(ans,(uint32) (ptr-ans),default_charset()))
-      return &empty_string;			// End of memory
+      return &my_empty_string;			// End of memory
     return str;
   }
 
diff --git a/sql/lock.cc b/sql/lock.cc
index 82004298453..ea5e60b558f 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -526,7 +526,7 @@ int lock_table_name(THD *thd, TABLE_LIST *table_list)
   table->locked_by_name=1;
   table_list->table=table;
 
-  if (hash_insert(&open_cache, (byte*) table))
+  if (my_hash_insert(&open_cache, (byte*) table))
   {
     my_free((gptr) table,MYF(0));
     DBUG_RETURN(-1);
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 9737434fa3a..1d7dd3aa5bb 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -795,7 +795,7 @@ extern I_List<THD> threads;
 extern I_List<NAMED_LIST> key_caches;
 extern MY_BITMAP temp_pool;
 extern DATE_FORMAT dayord;
-extern String empty_string;
+extern String my_empty_string;
 extern SHOW_VAR init_vars[],status_vars[], internal_vars[];
 extern struct show_table_type_st table_type_vars[];
 extern SHOW_COMP_OPTION have_isam;
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index 5e040d26dc3..b931ce0ba8c 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -177,7 +177,7 @@ int register_slave(THD* thd, uchar* packet, uint packet_length)
 
   pthread_mutex_lock(&LOCK_slave_list);
   unregister_slave(thd,0,0);
-  res= hash_insert(&slave_list, (byte*) si);
+  res= my_hash_insert(&slave_list, (byte*) si);
   pthread_mutex_unlock(&LOCK_slave_list);
   return res;
 
@@ -540,7 +540,7 @@ HOSTS";
 	goto err;
       }
       si->server_id = server_id;
-      hash_insert(&slave_list, (byte*)si);
+      my_hash_insert(&slave_list, (byte*)si);
     }
     strmake(si->host, row[1], sizeof(si->host)-1);
     si->port = atoi(row[port_ind]);
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 382d23fa6a2..147033be660 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1302,7 +1302,7 @@ bool sys_var_collation::check(THD *thd, set_var *var)
   String str(buff,sizeof(buff), system_charset_info), *res;
 
   if (!(res=var->value->val_str(&str)))
-    res= &empty_string;
+    res= &my_empty_string;
 
   if (!(tmp=get_charset_by_name(res->c_ptr(),MYF(0))))
   {
@@ -1925,7 +1925,7 @@ void set_var_init()
   {
     (*var)->name_length= strlen((*var)->name);
     (*var)->option_limits= find_option(my_long_options, (*var)->name);
-    hash_insert(&system_variable_hash, (byte*) *var);
+    my_hash_insert(&system_variable_hash, (byte*) *var);
   }
   /*
     Special cases
diff --git a/sql/slave.cc b/sql/slave.cc
index 8490881f5dc..641707aab2f 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -790,7 +790,7 @@ int add_table_rule(HASH* h, const char* table_spec)
   e->tbl_name = e->db + (dot - table_spec) + 1;
   e->key_len = len;
   memcpy(e->db, table_spec, len);
-  (void)hash_insert(h, (byte*)e);
+  (void)my_hash_insert(h, (byte*)e);
   return 0;
 }
 
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 7889a583fde..508ff88a0cf 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -1069,7 +1069,7 @@ static void init_check_host(void)
       else if (!hash_search(&acl_check_hosts,(byte*) &acl_user->host,
 			    (uint) strlen(acl_user->host.hostname)))
       {
-	if (hash_insert(&acl_check_hosts,(byte*) acl_user))
+	if (my_hash_insert(&acl_check_hosts,(byte*) acl_user))
 	{					// End of memory
 	  allow_all_hosts=1;			// Should never happen
 	  DBUG_VOID_RETURN;
@@ -1782,7 +1782,7 @@ public:
 	  privs = cols = 0;			/* purecov: deadcode */
 	  return;				/* purecov: deadcode */
 	}
-	hash_insert(&hash_columns, (byte *) mem_check);
+	my_hash_insert(&hash_columns, (byte *) mem_check);
       } while (!col_privs->file->index_next(col_privs->record[0]) &&
 	       !key_cmp(col_privs,key,0,key_len));
     }
@@ -1944,7 +1944,7 @@ static int replace_column_table(GRANT_TABLE *g_t,
 	goto end;				/* purecov: inspected */
       }
       GRANT_COLUMN *grant_column = new GRANT_COLUMN(xx->column,privileges);
-      hash_insert(&g_t->hash_columns,(byte*) grant_column);
+      my_hash_insert(&g_t->hash_columns,(byte*) grant_column);
     }
   }
   table->file->index_end();
@@ -2295,7 +2295,7 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
 	result= -1;				/* purecov: deadcode */
 	continue;				/* purecov: deadcode */
       }
-      hash_insert(&column_priv_hash,(byte*) grant_table);
+      my_hash_insert(&column_priv_hash,(byte*) grant_table);
     }
 
     /* If revoke_grant, calculate the new column privilege for tables_priv */
@@ -2538,7 +2538,7 @@ my_bool grant_init(THD *org_thd)
   {
     GRANT_TABLE *mem_check;
     if (!(mem_check=new GRANT_TABLE(t_table,c_table)) ||
-	mem_check->ok() && hash_insert(&column_priv_hash,(byte*) mem_check))
+	mem_check->ok() && my_hash_insert(&column_priv_hash,(byte*) mem_check))
     {
       /* This could only happen if we are out memory */
       grant_option= FALSE;			/* purecov: deadcode */
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index fa4f08b5f14..1e44aa6e46d 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -873,7 +873,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
     table->version=refresh_version;
     table->flush_version=flush_version;
     DBUG_PRINT("info", ("inserting table %p into the cache", table));
-    VOID(hash_insert(&open_cache,(byte*) table));
+    VOID(my_hash_insert(&open_cache,(byte*) table));
   }
 
   table->in_use=thd;
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index f7742c6b7a7..fb86f52ab6e 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -823,7 +823,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
 
 	Query_cache_query *header = query_block->query();
 	header->init_n_lock();
-	if (hash_insert(&queries, (byte*) query_block))
+	if (my_hash_insert(&queries, (byte*) query_block))
 	{
 	  refused++;
 	  DBUG_PRINT("qcache", ("insertion in query hash"));
@@ -2044,7 +2044,7 @@ Query_cache::insert_table(uint key_len, char *key,
     Query_cache_block_table *list_root = table_block->table(0);
     list_root->n = 0;
     list_root->next = list_root->prev = list_root;
-    if (hash_insert(&tables, (const byte *) table_block))
+    if (my_hash_insert(&tables, (const byte *) table_block))
     {
       DBUG_PRINT("qcache", ("Can't insert table to hash"));
       // write_block_data return locked block
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index d954d4dc22d..88e338d953b 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -583,7 +583,7 @@ sql_exchange::sql_exchange(char *name,bool flag)
   :file_name(name), opt_enclosed(0), dumpfile(flag), skip_lines(0)
 {
   field_term= &default_field_term;
-  enclosed=   line_start= &empty_string;
+  enclosed=   line_start= &my_empty_string;
   line_term=  &default_line_term;
   escaped=    &default_escaped;
 }
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 42f8bb16bcd..de76fef85a9 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -161,7 +161,7 @@ static int get_or_create_user_conn(THD *thd, const char *user,
     if (max_user_connections && mqh->connections > max_user_connections)
       uc->user_resources.connections = max_user_connections;
     uc->intime=thd->thr_create_time;
-    if (hash_insert(&hash_user_connections, (byte*) uc))
+    if (my_hash_insert(&hash_user_connections, (byte*) uc))
     {
       my_free((char*) uc,0);
       send_error(thd, 0, NullS);		// Out of memory
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 4b8001c11c4..0ea3132eabc 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -668,7 +668,9 @@ static bool mysql_test_select_fields(PREP_STMT *stmt, TABLE_LIST *tables,
     DBUG_RETURN(1);
     if (send_prep_stmt(stmt, fields.elements) ||
         thd->protocol_simple.send_fields(&fields, 0) ||
+#ifndef EMBEDDED_LIBRARY
         net_flush(&thd->net) ||
+#endif
         send_item_params(stmt))
       DBUG_RETURN(1);
     join->cleanup();
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index ab985ffbc6d..ff41e9fd067 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -7196,7 +7196,7 @@ static int remove_dup_with_hash_index(THD *thd, TABLE *table,
 	goto err;
     }
     else
-      (void) hash_insert(&hash, key_pos-key_length);
+      (void) my_hash_insert(&hash, key_pos-key_length);
     key_pos+=extra_length;
   }
   my_free((char*) key_buffer,MYF(0));
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 99410bb34ac..c237b023e7b 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -345,7 +345,7 @@ static udf_func *add_udf(LEX_STRING *name, Item_result ret, char *dl,
   tmp->returns = ret;
   tmp->type = type;
   tmp->usage_count=1;
-  if (hash_insert(&udf_hash,(byte*)  tmp))
+  if (my_hash_insert(&udf_hash,(byte*)  tmp))
     return 0;
   using_udf_functions=1;
   return tmp;
diff --git a/sql/table.cc b/sql/table.cc
index a980e086d60..5e7991436a1 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -459,7 +459,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
     if (outparam->timestamp_field == reg_field)
       outparam->timestamp_field_offset=i;
     if (use_hash)
-      (void) hash_insert(&outparam->name_hash,(byte*) *field_ptr); // Will never fail
+      (void) my_hash_insert(&outparam->name_hash,(byte*) *field_ptr); // Will never fail
   }
   *field_ptr=0;					// End marker
 
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index ddcec46474d..878493bc31f 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -6234,6 +6234,7 @@ static MY_COLLATION_HANDLER my_collation_big5_chinese_ci_handler =
   my_like_range_big5,
   my_wildcmp_mb,
   my_strcasecmp_mb,
+  my_instr_mb,
   my_hash_sort_simple
 };
 
@@ -6305,7 +6306,7 @@ CHARSET_INFO my_charset_big5_bin=
     2,			/* mbmaxlen   */
     0,
     &my_charset_big5_handler,
-    &my_collation_bin_handler
+    &my_collation_mb_bin_handler
 };
 
 
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index 9441268739a..3f74f514c48 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -262,8 +262,46 @@ static int my_strnxfrm_bin(CHARSET_INFO *cs __attribute__((unused)),
   return len;
 }
 
+static
+int my_instr_bin(CHARSET_INFO *cs __attribute__((unused)),
+                 const char *big,   uint b_length, 
+		 const char *small, uint s_length)
+{
+  register const uchar *str, *search, *end, *search_end;
+  
+  if (s_length <= b_length)
+  {
+    if (!s_length)
+      return 0;		// Empty string is always found
+    
+    str= (const uchar*) big;
+    search= (const uchar*) small;
+    end= (const uchar*) big+b_length-s_length+1;
+    search_end= (const uchar*) small + s_length;
+    
+skipp:
+    while (str != end)
+    {
+      if ( (*str++) == (*search))
+      {
+	register const uchar *i,*j;
+	
+	i= str; 
+	j= search+1;
+	
+	while (j != search_end)
+	  if ((*i++) != (*j++))
+            goto skipp;
+        
+	return (int) (str- (const uchar*)big) -1;
+      }
+    }
+  }
+  return -1;
+}
+
 
-MY_COLLATION_HANDLER my_collation_bin_handler =
+MY_COLLATION_HANDLER my_collation_8bit_bin_handler =
 {
     my_strnncoll_binary,
     my_strnncollsp_binary,
@@ -271,6 +309,7 @@ MY_COLLATION_HANDLER my_collation_bin_handler =
     my_like_range_simple,
     my_wildcmp_bin,
     my_strcasecmp_bin,
+    my_instr_bin,
     my_hash_sort_bin
 };
 
@@ -317,5 +356,5 @@ CHARSET_INFO my_charset_bin =
     1,				/* mbmaxlen      */
     (char) 255,			/* max_sort_char */
     &my_charset_handler,
-    &my_collation_bin_handler
+    &my_collation_8bit_bin_handler
 };
diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index 2398bc33d45..b2e4f1886ed 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@@ -612,6 +612,7 @@ static MY_COLLATION_HANDLER my_collation_latin2_czech_ci_handler =
   my_like_range_czech,
   my_wildcmp_8bit,
   my_strcasecmp_8bit,
+  my_instr_simple,
   my_hash_sort_simple,
 };
 
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index bb3e66a8c6f..d47c4268642 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@@ -8637,12 +8637,13 @@ my_mb_wc_euc_kr(CHARSET_INFO *cs __attribute__((unused)),
 
 static MY_COLLATION_HANDLER my_collation_ci_handler =
 {
-  my_strnncoll_simple,/* strnncoll  */
+  my_strnncoll_simple,  /* strnncoll  */
   my_strnncollsp_simple,
   my_strnxfrm_simple,	/* strnxfrm   */
-  my_like_range_simple,/* like_range */
+  my_like_range_simple, /* like_range */
   my_wildcmp_mb,	/* wildcmp    */
   my_strcasecmp_mb,
+  my_instr_mb,
   my_hash_sort_simple,
 };
 
@@ -8714,7 +8715,7 @@ CHARSET_INFO my_charset_euckr_bin=
     2,			/* mbmaxlen   */
     0,
     &my_charset_handler,
-    &my_collation_bin_handler
+    &my_collation_mb_bin_handler
 };
 
 #endif
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index b8cee35b186..d429fa34eea 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@@ -5687,12 +5687,13 @@ my_mb_wc_gb2312(CHARSET_INFO *cs  __attribute__((unused)),
 
 static MY_COLLATION_HANDLER my_collation_ci_handler =
 {
-  my_strnncoll_simple,/* strnncoll  */
+  my_strnncoll_simple,  /* strnncoll  */
   my_strnncollsp_simple,
   my_strnxfrm_simple,	/* strnxfrm   */
-  my_like_range_simple,/* like_range */
+  my_like_range_simple, /* like_range */
   my_wildcmp_mb,	/* wildcmp    */
-  my_strcasecmp_mb,
+  my_strcasecmp_mb,     /* instr      */
+  my_instr_mb,
   my_hash_sort_simple,
 };
 
@@ -5763,7 +5764,7 @@ CHARSET_INFO my_charset_gb2312_bin=
     2,			/* mbmaxlen   */
     0,
     &my_charset_handler,
-    &my_collation_bin_handler
+    &my_collation_mb_bin_handler
 };
 
 #endif
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index 4a84eabaf8c..fa7aa175103 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -9890,6 +9890,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
   my_like_range_gbk,
   my_wildcmp_mb,
   my_strcasecmp_mb,
+  my_instr_mb,
   my_hash_sort_simple,
 };
 
@@ -9960,7 +9961,7 @@ CHARSET_INFO my_charset_gbk_bin=
     2,			/* mbmaxlen */
     0,
     &my_charset_handler,
-    &my_collation_bin_handler
+    &my_collation_mb_bin_handler
 };
 
 
diff --git a/strings/ctype-latin1.c b/strings/ctype-latin1.c
index edbd350f364..a8a5329f844 100644
--- a/strings/ctype-latin1.c
+++ b/strings/ctype-latin1.c
@@ -390,6 +390,7 @@ static MY_COLLATION_HANDLER my_collation_german2_ci_handler=
   my_like_range_simple,
   my_wildcmp_8bit,
   my_strcasecmp_8bit,
+  my_instr_simple,
   my_hash_sort_simple
 };
 
@@ -435,6 +436,6 @@ CHARSET_INFO my_charset_latin1_bin=
   1,					/* mbmaxlen  */
   0,
   &my_charset_handler,
-  &my_collation_bin_handler
+  &my_collation_8bit_bin_handler
 };
 
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c
index 3d1abe95675..03323b3d3a1 100644
--- a/strings/ctype-mb.c
+++ b/strings/ctype-mb.c
@@ -126,11 +126,7 @@ int my_strcasecmp_mb(CHARSET_INFO * cs,const char *s, const char *t)
 #define INC_PTR(cs,A,B) A+=((use_mb_flag && \
                           my_ismbchar(cs,A,B)) ? my_ismbchar(cs,A,B) : 1)
 
-#ifdef LIKE_CMP_TOUPPER
-#define likeconv(s,A) (uchar) my_toupper(s,A)
-#else
 #define likeconv(s,A) (uchar) (s)->sort_order[(uchar) (A)]
-#endif
 
 int my_wildcmp_mb(CHARSET_INFO *cs,
 		  const char *str,const char *str_end,
@@ -278,5 +274,224 @@ uint my_charpos_mb(CHARSET_INFO *cs __attribute__((unused)),
   return b-b0;
 }
 
+int my_instr_mb(CHARSET_INFO *cs,
+                const char *big,   uint b_length, 
+                const char *small, uint s_length)
+{
+  register const char *end;
+  int res= 0;
+  
+  if (s_length <= b_length)
+  {
+    if (!s_length)
+      return 0;		// Empty string is always found
+    
+    end= big+b_length-s_length+1;
+    
+    while (big < end)
+    {
+      int mblen;
+      
+      if (!cs->coll->strnncoll(cs, (unsigned char*) big,   s_length, 
+      				   (unsigned char*) small, s_length))
+        return res;
+      
+      mblen= (mblen= my_ismbchar(cs, big, end)) ? mblen : 1;
+      big+= mblen;
+      b_length-= mblen;
+      res++;
+    }
+  }
+  return -1;
+}
+
+/* BINARY collations handlers for MB charsets */
+
+static int my_strnncoll_mb_bin(CHARSET_INFO * cs __attribute__((unused)),
+				const uchar *s, uint slen,
+				const uchar *t, uint tlen)
+{
+  int cmp= memcmp(s,t,min(slen,tlen));
+  return cmp ? cmp : (int) (slen - tlen);
+}
+
+static int my_strnncollsp_mb_bin(CHARSET_INFO * cs,
+                               const uchar *s, uint slen,
+                               const uchar *t, uint tlen)
+{
+  int len, cmp;
+
+  for ( ; slen && my_isspace(cs, s[slen-1]) ; slen--);
+  for ( ; tlen && my_isspace(cs, t[tlen-1]) ; tlen--);
+
+  len  = ( slen > tlen ) ? tlen : slen;
+
+  cmp= memcmp(s,t,len);
+  return cmp ? cmp : (int) (slen - tlen);
+}
+
+static int my_strnxfrm_mb_bin(CHARSET_INFO *cs __attribute__((unused)),
+			    uchar * dest, uint len,
+			    const uchar *src, 
+			    uint srclen __attribute__((unused)))
+{
+  if (dest != src)
+    memcpy(dest,src,len= min(len,srclen));
+  return len;
+}
+
+
+static int my_strcasecmp_mb_bin(CHARSET_INFO * cs __attribute__((unused)),
+		      const char *s, const char *t)
+{
+  return strcmp(s,t);
+}
+
+static void my_hash_sort_mb_bin(CHARSET_INFO *cs __attribute__((unused)),
+		      const uchar *key, uint len,ulong *nr1, ulong *nr2)
+{
+  const uchar *pos = key;
+  
+  key+= len;
+  
+  for (; pos < (uchar*) key ; pos++)
+  {
+    nr1[0]^=(ulong) ((((uint) nr1[0] & 63)+nr2[0]) * 
+	     ((uint)*pos)) + (nr1[0] << 8);
+    nr2[0]+=3;
+  }
+}
+
+static int my_wildcmp_mb_bin(CHARSET_INFO *cs,
+		  const char *str,const char *str_end,
+		  const char *wildstr,const char *wildend,
+		  int escape, int w_one, int w_many)
+{
+  int result= -1;				/* Not found, using wildcards */
+
+  bool use_mb_flag=use_mb(cs);
+
+  while (wildstr != wildend)
+  {
+    while (*wildstr != w_many && *wildstr != w_one)
+    {
+      int l;
+      if (*wildstr == escape && wildstr+1 != wildend)
+	wildstr++;
+      if (use_mb_flag &&
+          (l = my_ismbchar(cs, wildstr, wildend)))
+      {
+	  if (str+l > str_end || memcmp(str, wildstr, l) != 0)
+	      return 1;
+	  str += l;
+	  wildstr += l;
+      }
+      else
+      if (str == str_end || *wildstr++ != *str++)
+	return(1);				/* No match */
+      if (wildstr == wildend)
+	return (str != str_end);		/* Match if both are at end */
+      result=1;					/* Found an anchor char */
+    }
+    if (*wildstr == w_one)
+    {
+      do
+      {
+	if (str == str_end)			/* Skip one char if possible */
+	  return (result);
+	INC_PTR(cs,str,str_end);
+      } while (++wildstr < wildend && *wildstr == w_one);
+      if (wildstr == wildend)
+	break;
+    }
+    if (*wildstr == w_many)
+    {						/* Found w_many */
+      uchar cmp;
+      const char* mb = wildstr;
+      int mblen=0;
+      
+      wildstr++;
+      /* Remove any '%' and '_' from the wild search string */
+      for (; wildstr != wildend ; wildstr++)
+      {
+	if (*wildstr == w_many)
+	  continue;
+	if (*wildstr == w_one)
+	{
+	  if (str == str_end)
+	    return (-1);
+	  INC_PTR(cs,str,str_end);
+	  continue;
+	}
+	break;					/* Not a wild character */
+      }
+      if (wildstr == wildend)
+	return(0);				/* Ok if w_many is last */
+      if (str == str_end)
+	return -1;
+      
+      if ((cmp= *wildstr) == escape && wildstr+1 != wildend)
+	cmp= *++wildstr;
+	
+      mb=wildstr;
+      LINT_INIT(mblen);
+      if (use_mb_flag)
+        mblen = my_ismbchar(cs, wildstr, wildend);
+      INC_PTR(cs,wildstr,wildend);		/* This is compared trough cmp */
+      do
+      {
+        if (use_mb_flag)
+	{
+          for (;;)
+          {
+            if (str >= str_end)
+              return -1;
+            if (mblen)
+            {
+              if (str+mblen <= str_end && memcmp(str, mb, mblen) == 0)
+              {
+                str += mblen;
+                break;
+              }
+            }
+            else if (!my_ismbchar(cs, str, str_end) && *str == cmp)
+            {
+              str++;
+              break;
+            }
+            INC_PTR(cs,str, str_end);
+          }
+	}
+        else
+        {
+          while (str != str_end && *str != cmp)
+            str++;
+          if (str++ == str_end) return (-1);
+        }
+	{
+	  int tmp=my_wildcmp_mb(cs,str,str_end,wildstr,wildend,escape,w_one,w_many);
+	  if (tmp <= 0)
+	    return (tmp);
+	}
+      } while (str != str_end && wildstr[0] != w_many);
+      return(-1);
+    }
+  }
+  return (str != str_end ? 1 : 0);
+}
+
+
+MY_COLLATION_HANDLER my_collation_mb_bin_handler =
+{
+    my_strnncoll_mb_bin,
+    my_strnncollsp_mb_bin,
+    my_strnxfrm_mb_bin,
+    my_like_range_simple,
+    my_wildcmp_mb_bin,
+    my_strcasecmp_mb_bin,
+    my_instr_mb,
+    my_hash_sort_mb_bin
+};
+
 
 #endif
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index ca0097579bd..152980dd305 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -1030,6 +1030,44 @@ uint my_lengthsp_8bit(CHARSET_INFO *cs __attribute__((unused)),
 }
 
 
+int my_instr_simple(CHARSET_INFO *cs,
+                    const char *big,   uint b_length, 
+		    const char *small, uint s_length)
+{
+  register const uchar *str, *search, *end, *search_end;
+  
+  if (s_length <= b_length)
+  {
+    if (!s_length)
+      return 0;		// Empty string is always found
+    
+    str= (const uchar*) big;
+    search= (const uchar*) small;
+    end= (const uchar*) big+b_length-s_length+1;
+    search_end= (const uchar*) small + s_length;
+    
+skipp:
+    while (str != end)
+    {
+      if (cs->sort_order[*str++] == cs->sort_order[*search])
+      {
+	register const uchar *i,*j;
+	
+	i= str; 
+	j= search+1;
+	
+	while (j != search_end)
+	  if (cs->sort_order[*i++] != cs->sort_order[*j++]) 
+            goto skipp;
+        
+	return (int) (str- (const uchar*)big) -1;
+      }
+    }
+  }
+  return -1;
+}
+
+
 MY_CHARSET_HANDLER my_charset_8bit_handler=
 {
     NULL,			/* ismbchar      */
@@ -1063,5 +1101,6 @@ MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler =
     my_like_range_simple,
     my_wildcmp_8bit,
     my_strcasecmp_8bit,
+    my_instr_simple,
     my_hash_sort_simple
 };
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 9827c19e7fb..f302e678b9f 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -4477,6 +4477,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
   my_like_range_sjis,
   my_wildcmp_mb,	/* wildcmp  */
   my_strcasecmp_8bit,
+  my_instr_mb,
   my_hash_sort_simple,
 };
 
@@ -4547,7 +4548,7 @@ CHARSET_INFO my_charset_sjis_bin=
     2,			/* mbmaxlen */
     0,
     &my_charset_handler,
-    &my_collation_bin_handler
+    &my_collation_mb_bin_handler
 };
 
 #endif
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index 8a6e00b973a..a4d8a7d1f79 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -710,6 +710,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
     my_like_range_tis620,
     my_wildcmp_8bit,	/* wildcmp   */
     my_strcasecmp_8bit,
+    NULL,
     my_hash_sort_simple,
 };
 
@@ -781,7 +782,7 @@ CHARSET_INFO my_charset_tis620_bin=
     1,			/* mbmaxlen  */
     0,
     &my_charset_handler,
-    &my_collation_bin_handler
+    &my_collation_8bit_bin_handler
 };
 
 
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index a20502c65d4..31c0f063529 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1028,6 +1028,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
     my_like_range_simple,
     my_wildcmp_mb,
     my_strcasecmp_ucs2,
+    my_instr_mb,
     my_hash_sort_ucs2
 };
 
@@ -1100,7 +1101,7 @@ CHARSET_INFO my_charset_ucs2_bin=
     2,			/* mbmaxlen     */
     0,
     &my_charset_handler,
-    &my_collation_bin_handler
+    &my_collation_mb_bin_handler
 };
 
 
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 5ef6c1b7486..29375aca727 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -8434,6 +8434,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
     my_like_range_simple,/* like_range   */
     my_wildcmp_mb,	/* wildcmp      */
     my_strcasecmp_mb,
+    my_instr_mb,
     my_hash_sort_simple,
 };
 
@@ -8504,7 +8505,7 @@ CHARSET_INFO my_charset_ujis_bin=
     3,			/* mbmaxlen     */
     0,
     &my_charset_handler,
-    &my_collation_bin_handler
+    &my_collation_mb_bin_handler
 };
 
 
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 450c2d7aa93..3ede1aa26f6 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -1959,6 +1959,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
     my_like_range_simple,
     my_wildcmp_mb,
     my_strcasecmp_utf8,
+    my_instr_mb,
     my_hash_sort_utf8
 };
 
@@ -2031,7 +2032,7 @@ CHARSET_INFO my_charset_utf8_bin=
     3,			/* mbmaxlen     */
     0,
     &my_charset_handler,
-    &my_collation_bin_handler
+    &my_collation_mb_bin_handler
 };
 
 
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c
index 12a8edc4a8f..60a5737009f 100644
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.c
@@ -652,6 +652,7 @@ static MY_COLLATION_HANDLER my_collation_czech_ci_handler =
     my_like_range_win1250ch,
     my_wildcmp_8bit,
     my_strcasecmp_8bit,
+    my_instr_simple,
     my_hash_sort_simple
 };
 
diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c
index 70382c29735..f1efd3be3eb 100644
--- a/tools/mysqlmanager.c
+++ b/tools/mysqlmanager.c
@@ -818,7 +818,7 @@ HANDLE_DECL(handle_def_exec)
     update_req_len(e);
     hash_delete(&exec_hash,(byte*)old_e);
   }
-  hash_insert(&exec_hash,(byte*)e);
+  my_hash_insert(&exec_hash,(byte*)e);
   pthread_mutex_unlock(&lock_exec_hash);
   client_msg(&thd->net,MANAGER_OK,"Exec definition created");
   return 0;
@@ -1666,7 +1666,7 @@ static void init_user_hash()
     }
     else
     {
-      hash_insert(&user_hash,(gptr)u);
+      my_hash_insert(&user_hash,(gptr)u);
     }
   }
   my_fclose(f, MYF(0));