diff --git a/.bzrignore b/.bzrignore
index df2eef8f1c6..6aff656c225 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -282,3 +282,92 @@ sql/share/norwegian/errmsg.sys
 sql/share/norwegian-ny/errmsg.sys
 mysql-test/r/3.23/rpl000001.b.result.reject
 mysql-test/r/3.23/rpl000012.result.reject
+libmysql_r/acconfig.h
+libmysql_r/array.c
+libmysql_r/bchange.c
+libmysql_r/bmove.c
+libmysql_r/bmove_upp.c
+libmysql_r/charset.c
+libmysql_r/conf_to_src.c
+libmysql_r/ctype_autoconf.c
+libmysql_r/ctype-big5.c
+libmysql_r/ctype.c
+libmysql_r/ctype-czech.c
+libmysql_r/ctype-euc_kr.c
+libmysql_r/ctype-gb2312.c
+libmysql_r/ctype-gbk.c
+libmysql_r/ctype-sjis.c
+libmysql_r/ctype-tis620.c
+libmysql_r/ctype-ujis.c
+libmysql_r/dbug.c
+libmysql_r/default.c
+libmysql_r/dll.c
+libmysql_r/errmsg.c
+libmysql_r/errors.c
+libmysql_r/getopt1.c
+libmysql_r/getopt.c
+libmysql_r/get_password.c
+libmysql_r/getvar.c
+libmysql_r/int2str.c
+libmysql_r/is_prefix.c
+libmysql_r/libmysql.c
+libmysql_r/list.c
+libmysql_r/llstr.c
+libmysql_r/longlong2str.c
+libmysql_r/mf_casecnv.c
+libmysql_r/mf_dirname.c
+libmysql_r/mf_fn_ext.c
+libmysql_r/mf_format.c
+libmysql_r/mf_loadpath.c
+libmysql_r/mf_pack.c
+libmysql_r/mf_path.c
+libmysql_r/mf_tempfile.c
+libmysql_r/mf_unixpath.c
+libmysql_r/mf_wcomp.c
+libmysql_r/mulalloc.c
+libmysql_r/my_alloc.c
+libmysql_r/my_compress.c
+libmysql_r/my_create.c
+libmysql_r/my_delete.c
+libmysql_r/my_div.c
+libmysql_r/my_error.c
+libmysql_r/my_fopen.c
+libmysql_r/my_fstream.c
+libmysql_r/my_getwd.c
+libmysql_r/my_init.c
+libmysql_r/my_lib.c
+libmysql_r/my_malloc.c
+libmysql_r/my_messnc.c
+libmysql_r/my_net.c
+libmysql_r/my_once.c
+libmysql_r/my_open.c
+libmysql_r/my_pthread.c
+libmysql_r/my_read.c
+libmysql_r/my_realloc.c
+libmysql_r/my_static.c
+libmysql_r/my_static.h
+libmysql_r/mysys_priv.h
+libmysql_r/my_thr_init.c
+libmysql_r/my_write.c
+libmysql_r/net.c
+libmysql_r/password.c
+libmysql_r/safemalloc.c
+libmysql_r/str2int.c
+libmysql_r/strcend.c
+libmysql_r/strcont.c
+libmysql_r/strend.c
+libmysql_r/strfill.c
+libmysql_r/string.c
+libmysql_r/strinstr.c
+libmysql_r/strmake.c
+libmysql_r/strmov.c
+libmysql_r/strnlen.c
+libmysql_r/strnmov.c
+libmysql_r/strto.c
+libmysql_r/strtoll.c
+libmysql_r/strtoull.c
+libmysql_r/strxmov.c
+libmysql_r/thr_mutex.c
+libmysql_r/typelib.c
+libmysql_r/violite.c
+linked_libmysql_r_sources
diff --git a/sql/share/romanian/errmsg.sys b/sql/share/romanian/errmsg.sys
index 1638246579c..a8336a034a8 100644
Binary files a/sql/share/romanian/errmsg.sys and b/sql/share/romanian/errmsg.sys differ
diff --git a/sql/slave.cc b/sql/slave.cc
index c969d7f11ae..830ea070293 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1161,9 +1161,8 @@ static void safe_connect(THD* thd, MYSQL* mysql, MASTER_INFO* mi)
 	!mc_mysql_connect(mysql, mi->host, mi->user, mi->password, 0,
 			  mi->port, 0, 0))
   {
-    sql_print_error(
-		    "Slave thread: error connecting to master:%s, retry in %d sec",
-		    mc_mysql_error(mysql), mi->connect_retry);
+    sql_print_error("Slave thread: error connecting to master:%s(%d),\
+ retry in %d sec", mc_mysql_error(mysql), errno, mi->connect_retry);
     safe_sleep(thd, mi->connect_retry);
   }
   
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 45bd8959a8e..9ec85a9114e 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -446,11 +446,10 @@ void close_temporary_tables(THD *thd)
   {
     if(query) // we might be out of memory, but this is not fatal
       {
-	p = strmov(p,table->table_cache_key); // here we assume it always starts
+	p = strxmov(p,table->table_cache_key,".",
+		    table->table_name,",", NullS);
+	// here we assume table_cache_key always starts
 	// with \0 terminated db name
-	*p++ = '.';
-	p = strmov(p,table->table_name);
-	*p++ = ',';
       }
     next=table->next;
     close_temporary(table);
@@ -474,7 +473,7 @@ TABLE **find_temporary_table(THD *thd, const char *db, const char *table_name)
   uint	key_length= (uint) (strmov(strmov(key,db)+1,table_name)-key)+1;
   TABLE *table,**prev;
 
-  *((ulong*)(key+key_length)) = thd->slave_proxy_id;
+  int4store(key+key_length,thd->slave_proxy_id);
   key_length += 4;
   
   prev= &thd->temporary_tables;
@@ -514,7 +513,7 @@ bool rename_temporary_table(THD* thd, TABLE *table, const char *db,
     (strmov((table->real_name=strmov(table->table_cache_key=key,
 				     db)+1),
 	    table_name) - table->table_cache_key)+1;
-  *((ulong*)(key+table->key_length)) = thd->slave_proxy_id;
+  int4store(key+table->key_length,thd->slave_proxy_id);
   table->key_length += 4;
   return 0;
 }
@@ -669,7 +668,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
   if (thd->killed)
     DBUG_RETURN(0);
   key_length= (uint) (strmov(strmov(key,db)+1,table_name)-key)+1;
-  *((ulong*)(key + key_length)) = thd->slave_proxy_id;
+  int4store(key + key_length, thd->slave_proxy_id);
   key_length += 4;
   
   for (table=thd->temporary_tables; table ; table=table->next)
@@ -1413,8 +1412,8 @@ TABLE *open_temporary_table(THD *thd, const char *path, const char *db,
   tmp_table->key_length= (uint) (strmov(strmov(tmp_table->table_cache_key,db)
 					+1, table_name)
 				 - tmp_table->table_cache_key)+1;
-  *((ulong*)(tmp_table->table_cache_key + tmp_table->key_length)) =
-	thd->slave_proxy_id;
+  int4store(tmp_table->table_cache_key + tmp_table->key_length,
+	    thd->slave_proxy_id);
   tmp_table->key_length += 4;
   
   if (link_in_list)