laptop commit

BUILD/compile-pentium-debug-no-bdb

+make -k clean
+/bin/rm -f */.deps/*.P config.cache
+
+aclocal; autoheader; aclocal; automake; autoconf
+
+# If you are not using codefusion add "-Wpointer-arith" to WARNINGS
+# The following warning flag will give too many warnings:
+# -Wshadow -Wunused  -Winline (The later isn't usable in C++ as
+# __attribute()__ doesn't work with gnu C++)
+
+GLOBAL_WARNINGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wuninitialized -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"
+C_WARNINGS="$GLOBAL_WARNINGS -Wunused"
+CC_WARNINGS="$GLOBAL_WARNINGS -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
+
+
+CFLAGS="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS  -O2 -mpentiumpro $C_WARNINGS" CXX=gcc \
+CXXFLAGS="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -O2 -mpentiumpro -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" \
+./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex --with-debug=full 
+make

sql/log.cc

@@ -289,6 +289,7 @@ int MYSQL_LOG::purge_logs(THD* thd, const char* to_log)
   bool logs_to_purge_inited = 0, logs_to_keep_inited = 0, found_log = 0;
   DYNAMIC_ARRAY logs_to_purge, logs_to_keep;
   my_off_t purge_offset ;
+  LINT_INIT(purge_offset);
   pthread_mutex_lock(&LOCK_index);
   
   if(my_fseek(index_file, 0, MY_SEEK_SET,

sql/sql_insert.cc

@@ -1089,12 +1089,14 @@ bool delayed_insert::handle_inserts(void)
       pthread_mutex_lock(&LOCK_delayed_status);
       delayed_insert_errors++;
       pthread_mutex_unlock(&LOCK_delayed_status);
+      row->log_query = 0;
     }
     if (row->query && row->log_query)
     {
       mysql_update_log.write(&thd,row->query, row->query_length);
       if (mysql_bin_log.is_open())
       {
+	thd.query_length = row->query_length;
 	Query_log_event qinfo(&thd, row->query);
 	mysql_bin_log.write(&qinfo);
       }

sql/sql_repl.cc

@@ -149,7 +149,7 @@ int purge_master_logs(THD* thd, const char* to_log)
   char search_file_name[FN_REFLEN];
   mysql_bin_log.make_log_name(search_file_name, to_log);
   int res = mysql_bin_log.purge_logs(thd, search_file_name);
-  char* errmsg = 0;
+  const char* errmsg = 0;
   switch(res)
     {
     case 0: break;
@@ -169,9 +169,14 @@ binlog purge"; break;
     }
   
   if(errmsg)
+    {
      send_error(&thd->net, 0, errmsg);
+     return 1;
+    }
   else
     send_ok(&thd->net);
+  
+  return 0;
 }
 
 void mysql_binlog_send(THD* thd, char* log_ident, ulong pos, ushort flags)