Merge work.mysql.com:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql

.bzrignore

@@ -173,3 +173,4 @@ mysql-test/var/lib/test/elt_ck2.frm
 mysql-test/var/lib/test/elt_ck2.MYD
 mysql-test/var/lib/test/elt_ck2.MYI
 repl-tests/test-repl-ts/repl-timestamp.master.reject
+client/.mysqladmin.c.swp

sql/item_strfunc.cc

@@ -309,6 +309,16 @@ void Item_func_concat_ws::fix_length_and_dec()
     max_length=MAX_BLOB_WIDTH;
     maybe_null=1;
   }
+  used_tables_cache|=separator->used_tables();
+  const_item_cache&=separator->const_item();
+}
+
+void Item_func_concat_ws::update_used_tables()
+{
+  Item_func::update_used_tables();
+  separator->update_used_tables();
+  used_tables_cache|=separator->used_tables();
+  const_item_cache&=separator->const_item();
 }
 
 

sql/item_strfunc.h

@@ -69,6 +69,12 @@ public:
   ~Item_func_concat_ws() { delete separator; }
   String *val_str(String *);
   void fix_length_and_dec();
+  void update_used_tables();
+  bool fix_fields(THD *thd,struct st_table_list *tlist)
+  {
+    return (separator->fix_fields(thd,tlist)
+	    || Item_func::fix_fields(thd,tlist));
+  }
  const char *func_name() const { return "concat_ws"; }
 };
 

sql/mini_client.cc

@@ -371,6 +371,11 @@ char * STDCALL mc_mysql_error(MYSQL *mysql)
   return (mysql)->net.last_error;
 }
 
+int STDCALL mc_mysql_errno(MYSQL *mysql)
+{
+  return (mysql)->net.last_errno;
+}
+
 my_bool STDCALL mc_mysql_reconnect(MYSQL *mysql)
 {
   MYSQL tmp_mysql;

sql/mini_client.h

@@ -39,7 +39,9 @@ uint STDCALL
 mc_net_safe_read(MYSQL *mysql);
 
 char * STDCALL mc_mysql_error(MYSQL *mysql);
+int STDCALL mc_mysql_errno(MYSQL *mysql);
 my_bool STDCALL mc_mysql_reconnect(MYSQL* mysql);
 
 
 #endif
+

sql/mysqlbinlog.cc

@@ -321,7 +321,7 @@ static void dump_local_log_entries(const char* logname)
  if(!file)
    die("Could not open log file %s", logname);
 
- if(my_fseek(file, position, MY_SEEK_SET, MYF(MY_WME)))
+ if(my_fseek(file, position, MY_SEEK_SET, MYF(MY_WME)) == MY_FILEPOS_ERROR)
    die("failed on my_fseek()");
 
  if(!position)

sql/slave.cc

@@ -562,8 +562,9 @@ static uint read_event(MYSQL* mysql, MASTER_INFO *mi)
     return packet_error;
   if (len == packet_error || (int) len < 1)
   {
-    sql_print_error("Error reading packet from server: %s (%d)",
-		    mc_mysql_error(mysql), read_errno);
+    sql_print_error("Error reading packet from server: %s (read_errno %d,\
+server_errno=%d)",
+		    mc_mysql_error(mysql), read_errno, mc_mysql_errno(mysql));
     return packet_error;
   }
 

sql/sql_repl.cc

@@ -466,7 +466,7 @@ sweepstakes if you report the bug";
   pthread_mutex_unlock(&LOCK_thread_count);
   if(log)
    (void) my_fclose(log, MYF(MY_WME));
-  send_error(&thd->net, 0, errmsg);
+  send_error(&thd->net, my_errno, errmsg);
   DBUG_VOID_RETURN;
 }