bk commit into 5.1 tree (monty:1.2518)

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-29 16:47:11+03:00, monty@stripped +9 -0
  Don't give warning that readonly variable is forced to be readonly
  mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
  Fixed wrong reference to the mysql manual
  Fixed wrong prototype that caused some tests to fail on 64 bit platforms

  mysql-test/lib/mtr_report.pl@stripped, 2007-05-29 16:47:09+03:00, monty@stripped +58 -6
    Test run now fails if we have [Warning] and [ERROR] as tags in .err file
    Added list of all common 'not fatal' errors to ignore error list

  mysql-test/mysql-test-run-shell.sh@stripped, 2007-05-29 16:47:09+03:00, monty@stripped +7
-2
    Fixed some wrong startup options

  mysql-test/t/disabled.def@stripped, 2007-05-29 16:47:09+03:00, monty@stripped +3 -0
    Disable instance manager tests because they generate warnings (and probably don't read
the option files correctly)

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-05-29 16:47:09+03:00, monty@stripped +10 -10
    Ensure we log all binglog errors with the "NDB Binlog" tag

  sql/slave.cc@stripped, 2007-05-29 16:47:09+03:00, monty@stripped +2 -2
    Make errors uniform

  sql/sql_plugin.cc@stripped, 2007-05-29 16:47:09+03:00, monty@stripped +2 -2
    Don't give warning that readonly variable is forced to be readonly

  sql/stacktrace.c@stripped, 2007-05-29 16:47:09+03:00, monty@stripped +5 -3
    Corrected manual reference

  storage/blackhole/ha_blackhole.cc@stripped, 2007-05-29 16:47:09+03:00, monty@stripped +2 -2
    Fixed wrong prototype that caused test to fail on 64 bit platforms

  storage/example/ha_example.cc@stripped, 2007-05-29 16:47:09+03:00, monty@stripped +1 -1
    Fixed wrong prototype that caused test to fail on 64 bit platforms

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1

--- 1.340/mysql-test/mysql-test-run-shell.sh	2006-12-15 02:13:05 +02:00
+++ 1.341/mysql-test/mysql-test-run-shell.sh	2007-05-29 16:47:09 +03:00
@@ -629,6 +629,11 @@ else
   TEST_MODE=`echo $TEST_MODE | sed 's/^ *//'`
 fi
 
+#
+# Skip tests that doesn't work with shell version
+#
+SKIP_TEST="$SKIP_TEST bootstrap"
+
 #++
 # mysqld Environment Parameters
 #--
@@ -900,8 +905,8 @@ MYSQL_DUMP="$MYSQL_DUMP --no-defaults --
 MYSQL_SLAP="$MYSQL_SLAP -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD
$EXTRA_MYSQLSLAP_OPT"
 MYSQL_DUMP_SLAVE="$MYSQL_DUMP_DIR --no-defaults -uroot --socket=$SLAVE_MYSOCK
--password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
 MYSQL_SHOW="$MYSQL_SHOW --no-defaults --debug-info -uroot --socket=$MASTER_MYSOCK
--password=$DBPASSWD $EXTRA_MYSQLSHOW_OPT"
-MYSQL_BINLOG="$MYSQL_BINLOG --debug-info --no-defaults --local-load=$MYSQL_TMP_DIR 
--character-sets-dir=$CHARSETSDIR $EXTRA_MYSQLBINLOG_OPT"
-MYSQL_IMPORT="$MYSQL_IMPORT --debug-info -uroot --socket=$MASTER_MYSOCK
--password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
+MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --debug-info --local-load=$MYSQL_TMP_DIR 
--character-sets-dir=$CHARSETSDIR $EXTRA_MYSQLBINLOG_OPT"
+MYSQL_IMPORT="$MYSQL_IMPORT --no-defaults --debug-info -uroot --socket=$MASTER_MYSOCK
--password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
 MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost
--port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD
--basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"
 MYSQL="$MYSQL --no-defaults --debug-info --host=localhost --port=$MASTER_MYPORT
--socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"
 export MYSQL MYSQL_CHECK MYSQL_DUMP MYSQL_DUMP_SLAVE MYSQL_SHOW MYSQL_BINLOG
MYSQL_FIX_SYSTEM_TABLES MYSQL_IMPORT

--- 1.308/sql/slave.cc	2007-05-24 01:39:21 +03:00
+++ 1.309/sql/slave.cc	2007-05-29 16:47:09 +03:00
@@ -601,9 +601,9 @@ void slave_print_msg(enum loglevel level
   my_vsnprintf(pbuff, pbuffsize, msg, args);
   /* If the msg string ends with '.', do not add a ',' it would be ugly */
   if (pbuff[0] && (*(strend(pbuff)-1) == '.'))
-    (*report_function)("Slave: %s Error_code: %d", pbuff, err_code);
+    (*report_function)("Slave: %s  Error_code: %d", pbuff, err_code);
   else
-    (*report_function)("Slave: %s, Error_code: %d", pbuff, err_code);
+    (*report_function)("Slave: %s. Error_code: %d", pbuff, err_code);
   DBUG_VOID_RETURN;
 }
 

--- 1.57/storage/example/ha_example.cc	2007-05-24 01:39:26 +03:00
+++ 1.58/storage/example/ha_example.cc	2007-05-29 16:47:09 +03:00
@@ -114,7 +114,7 @@ pthread_mutex_t example_mutex;
   Function we use in the creation of our hash to get key.
 */
 
-static uchar* example_get_key(EXAMPLE_SHARE *share,uint *length,
+static uchar* example_get_key(EXAMPLE_SHARE *share, size_t *length,
                              my_bool not_used __attribute__((unused)))
 {
   *length=share->table_name_length;

--- 1.52/storage/blackhole/ha_blackhole.cc	2007-05-24 19:47:55 +03:00
+++ 1.53/storage/blackhole/ha_blackhole.cc	2007-05-29 16:47:09 +03:00
@@ -287,8 +287,8 @@ static void blackhole_free_key(st_blackh
   my_free((uchar*) share, MYF(0));
 }
 
-static uchar* blackhole_get_key(st_blackhole_share *share, uint *length,
-                               my_bool not_used __attribute__((unused)))
+static uchar* blackhole_get_key(st_blackhole_share *share, size_t *length,
+                                my_bool not_used __attribute__((unused)))
 {
   *length= share->table_name_length;
   return (uchar*) share->table_name;

--- 1.47/mysql-test/lib/mtr_report.pl	2007-05-01 11:29:59 +03:00
+++ 1.48/mysql-test/lib/mtr_report.pl	2007-05-29 16:47:09 +03:00
@@ -265,8 +265,12 @@ sub mtr_report_stats ($) {
     else
     {
       # We report different types of problems in order
-      foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x",
-			    "InnoDB: Warning", "missing DBUG_RETURN",
+      foreach my $pattern ( "^Warning:",
+			    "\\[Warning\\]",
+			    "\\[ERROR\\]",
+			    "^Error:", "^==.* at 0x",
+			    "InnoDB: Warning",
+			    "missing DBUG_RETURN",
 			    "mysqld: Warning",
 			    "allocated at line",
 			    "Attempting backtrace", "Assertion .* failed" )
@@ -281,10 +285,58 @@ sub mtr_report_stats ($) {
           while ( <ERR> )
           {
             # Skip some non fatal warnings from the log files
-            if ( /Warning:\s+Table:.* on (delete|rename)/ or
-                 /Warning:\s+Setting lower_case_table_names=2/ or
-                 /Warning:\s+One can only use the --user.*root/ or
-	         /InnoDB: Warning: we did not need to do crash recovery/)
+            if (
+		/Aborted connection/ or
+		/Client requested master to start replication from impossible position/ or
+		/Could not find first log file name in binary log/ or
+		/Enabling keys got errno/ or
+		/Error reading master configuration/ or
+		/Error reading packet/ or
+		/Event Scheduler/ or
+		/Failed to open the existing master info file/ or
+		/Failed to open log/ or
+		/Forcing shutdown of [0-9]* plugins/ or
+		/Got error [0-9]* when reading table/ or
+		/Incorrect definition of table/ or
+		/Incorrect information in file/ or
+		/InnoDB: Warning: we did not need to do crash recovery/ or
+		/Invalid \(old\?\) table or database name/ or
+		/Lock wait timeout exceeded/ or
+		/Log entry on master is longer than max_allowed_packet/ or
+		/NDB Binlog:/ or
+		/Neither --relay-log nor --relay-log-index were used/ or
+		/Query partially completed/ or
+		/Slave I.O thread aborted while waiting for relay log/ or
+		/Slave SQL thread is stopped because UNTIL condition/ or
+		/Slave \(additional info\)/ or
+		/Slave: According to the master's version/ or
+		/Slave: Error .*Deadlock found/ or
+		/Slave: Error .*Unknown table/ or
+		/Slave: Query caused different errors on master and slave/ or
+		/Slave: The incident LOST_EVENTS occured on the master/ or
+		/Slave: Unknown error.* 1105/ or
+		/Slave: .*master may suffer from/ or
+		/Slave: Error in Write_rows event: / or
+		/Slave: Table width mismatch/ or
+		/Slave: Error .* doesn't exist/ or
+		/Slave: Column [0-9]* type mismatch/ or
+		/Slave: Table .* doesn't exist/ or
+		/Slave: Field .* of table .* has no default value/ or
+		/Sort aborted/ or
+		/Warning:\s+One can only use the --user.*root/ or
+		/Warning:\s+Setting lower_case_table_names=2/ or
+		/Warning:\s+Table:.* on (delete|rename)/ or
+		/You have an error in your SQL syntax/ or
+		/deprecated/ or
+		/description of time zone/ or
+		/equal MySQL server ids/ or
+		/error .*connecting to master/ or
+		/error reading log entry/ or
+		/lower_case_table_names is set/ or
+		/skip-name-resolve mode/ or
+		/slave SQL thread aborted/ or
+ 		/Slave: .*Duplicate entry/
+	       )
             {
               next;                       # Skip these lines
             }

--- 1.253/mysql-test/t/disabled.def	2007-05-23 10:41:27 +03:00
+++ 1.254/mysql-test/t/disabled.def	2007-05-29 16:47:09 +03:00
@@ -15,6 +15,9 @@ im_options               : Bug#20294 200
 im_daemon_life_cycle     : Bug#20294 2007-05-14 alik      Instance manager tests fail
randomly
 im_cmd_line              : Bug#20294 2007-05-14 alik      Instance manager tests fail
randomly
 im_life_cycle            : BUG#27851 Instance manager dies on ASSERT in
~Thread_registry() or from not being able to close a mysqld instance.
+im_instance_conf         : BUG#28743 Instance manager generates warnings in test suite
+im_utils                 : BUG#28743 Instance manager generates warnings in test suite
+
 concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random failures
with varying differences
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog

--- 1.28/sql/stacktrace.c	2007-05-10 12:59:30 +03:00
+++ 1.29/sql/stacktrace.c	2007-05-29 16:47:09 +03:00
@@ -206,9 +206,11 @@ terribly wrong...\n");
   fprintf(stderr, "Stack trace seems successful - bottom reached\n");
 
 end:
-  fprintf(stderr, "Please read http://dev.mysql.com/doc/mysql/en/using-stack-trace.html
and follow instructions on how to resolve the stack trace. Resolved\n\
-stack trace is much more helpful in diagnosing the problem, so please do \n\
-resolve it\n");
+  fprintf(stderr,
+          "Please read http://dev.mysql.com/doc/refman/5.1/en/resolve-stack-dump.html\n"
+          "and follow instructions on how to resolve the stack trace.\n"
+          "Resolved stack trace is much more helpful in diagnosing the\n"
+          "problem, so please do resolve it\n");
 }
 #endif /* TARGET_OS_LINUX */
 #endif /* HAVE_STACKTRACE */

--- 1.67/sql/sql_plugin.cc	2007-05-28 19:58:00 +03:00
+++ 1.68/sql/sql_plugin.cc	2007-05-29 16:47:09 +03:00
@@ -2879,9 +2879,9 @@ static int construct_options(MEM_ROOT *m
       if (!opt->update)
       {
         opt->update= update_func_str;
-        if (!(opt->flags & PLUGIN_VAR_MEMALLOC))
+        if (!(opt->flags & PLUGIN_VAR_MEMALLOC | PLUGIN_VAR_READONLY))
         {
-          opt->flags |= PLUGIN_VAR_READONLY;
+          opt->flags|= PLUGIN_VAR_READONLY;
           sql_print_warning("Server variable %s of plugin %s was forced "
                             "to be read-only: string variable without "
                             "update_func and PLUGIN_VAR_MEMALLOC flag",

--- 1.119/sql/ha_ndbcluster_binlog.cc	2007-05-24 01:39:17 +03:00
+++ 1.120/sql/ha_ndbcluster_binlog.cc	2007-05-29 16:47:09 +03:00
@@ -1893,16 +1893,16 @@ ndb_binlog_thread_handle_schema_event(TH
           pthread_mutex_lock(&LOCK_open);
           if (ndbcluster_check_if_local_table(schema->db, schema->name))
           {
-            DBUG_PRINT("info", ("NDB binlog: Skipping locally defined table '%s.%s'",
+            DBUG_PRINT("info", ("NDB Binlog: Skipping locally defined table '%s.%s'",
                                 schema->db, schema->name));
-            sql_print_error("NDB binlog: Skipping locally defined table '%s.%s' from "
+            sql_print_error("NDB Binlog: Skipping locally defined table '%s.%s' from "
                             "binlog schema event '%s' from node %d. ",
                             schema->db, schema->name, schema->query,
                             schema->node_id);
           }
           else if (ndb_create_table_from_engine(thd, schema->db, schema->name))
           {
-            sql_print_error("NDB binlog: Could not discover table '%s.%s' from "
+            sql_print_error("NDB Binlog: Could not discover table '%s.%s' from "
                             "binlog schema event '%s' from node %d. "
                             "my_errno: %d",
                             schema->db, schema->name, schema->query,
@@ -1910,7 +1910,7 @@ ndb_binlog_thread_handle_schema_event(TH
             List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
             MYSQL_ERROR *err;
             while ((err= it++))
-              sql_print_warning("NDB binlog: (%d)%s", err->code, err->msg);
+              sql_print_warning("NDB Binlog: (%d)%s", err->code, err->msg);
           }
           pthread_mutex_unlock(&LOCK_open);
           log_query= 1;
@@ -1931,7 +1931,7 @@ ndb_binlog_thread_handle_schema_event(TH
           else
           {
             /* Database contained local tables, leave it */
-            sql_print_error("NDB binlog: Skipping drop database '%s' since it contained
local tables "
+            sql_print_error("NDB Binlog: Skipping drop database '%s' since it contained
local tables "
                             "binlog schema event '%s' from node %d. ",
                             schema->db, schema->query,
                             schema->node_id);
@@ -2179,23 +2179,23 @@ ndb_binlog_thread_handle_schema_event_po
           pthread_mutex_lock(&LOCK_open);
           if (ndbcluster_check_if_local_table(schema->db, schema->name))
           {
-            DBUG_PRINT("info", ("NDB binlog: Skipping locally defined table '%s.%s'",
+            DBUG_PRINT("info", ("NDB Binlog: Skipping locally defined table '%s.%s'",
                                 schema->db, schema->name));
-            sql_print_error("NDB binlog: Skipping locally defined table '%s.%s' from "
+            sql_print_error("NDB Binlog: Skipping locally defined table '%s.%s' from "
                             "binlog schema event '%s' from node %d. ",
                             schema->db, schema->name, schema->query,
                             schema->node_id);
           }
           else if (ndb_create_table_from_engine(thd, schema->db, schema->name))
           {
-            sql_print_error("NDB binlog: Could not discover table '%s.%s' from "
+            sql_print_error("NDB Binlog: Could not discover table '%s.%s' from "
                             "binlog schema event '%s' from node %d. my_errno: %d",
                             schema->db, schema->name, schema->query,
                             schema->node_id, my_errno);
             List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
             MYSQL_ERROR *err;
             while ((err= it++))
-              sql_print_warning("NDB binlog: (%d)%s", err->code, err->msg);
+              sql_print_warning("NDB Binlog: (%d)%s", err->code, err->msg);
           }
           pthread_mutex_unlock(&LOCK_open);
         }
@@ -4113,7 +4113,7 @@ restart:
           injector::transaction::binlog_pos start= trans.start_pos();
           if (int r= trans.commit())
           {
-            sql_print_error("NDB binlog: "
+            sql_print_error("NDB Binlog: "
                             "Error during COMMIT of GCI. Error: %d",
                             r);
             /* TODO: Further handling? */