Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

client/mysqltest.c

@@ -572,7 +572,7 @@ static void abort_not_supported_test()
     printf("skipped\n");
   free_used_memory();
   my_end(MY_CHECK_ERROR);
-  exit(2);
+  exit(62);
 }
 
 static void verbose_msg(const char* fmt, ...)
@@ -2597,6 +2597,8 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
 
     if (!disable_result_log)
     {
+      ulong affected_rows;    /* Ok to be undef if 'disable_info' is set */
+
       if (res)
       {
 	MYSQL_FIELD *field= mysql_fetch_fields(res);
@@ -2619,6 +2621,13 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
 	append_result(ds, res);
       }
 
+      /*
+        Need to call mysql_affected_rows() before the new
+        query to find the warnings
+      */
+      if (!disable_info)
+        affected_rows= (ulong)mysql_affected_rows(mysql);
+
       /* Add all warnings to the result */
       if (!disable_warnings && mysql_warning_count(mysql))
       {
@@ -2641,7 +2650,7 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
       if (!disable_info)
       {
 	char buf[40];
-	sprintf(buf,"affected rows: %lu\n",(ulong) mysql_affected_rows(mysql));
+	sprintf(buf,"affected rows: %lu\n", affected_rows);
 	dynstr_append(ds, buf);
 	if (mysql_info(mysql))
 	{
@@ -3522,6 +3531,12 @@ int main(int argc, char **argv)
 	if (q->query == q->query_buf)
 	  q->query += q->first_word_len + 1;
 	display_result_vertically= (q->type==Q_QUERY_VERTICAL);
+	if (save_file[0])
+	{
+	  strmov(q->record_file,save_file);
+	  q->require_file=require_file;
+	  save_file[0]=0;
+	}
 	error|= run_query(&cur_con->mysql, q, QUERY_REAP|QUERY_SEND);
 	display_result_vertically= old_display_result_vertically;
 	break;

mysql-test/lib/init_db.sql

-USE mysql;
+use mysql;
+set table_type=myisam;
 
 CREATE TABLE db (
   Host char(60) binary DEFAULT '' NOT NULL,
@@ -193,7 +194,7 @@ INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES
 
 CREATE TABLE time_zone (
   Time_zone_id int unsigned NOT NULL auto_increment,
-  Use_leap_seconds enum('Y','N') DEFAULT 'N' NOT NULL,
+  Use_leap_seconds enum('Y','N') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
   PRIMARY KEY TzId (Time_zone_id)
 ) engine=MyISAM
 CHARACTER SET utf8

mysql-test/lib/mtr_process.pl

@@ -344,7 +344,7 @@ sub mtr_kill_leftovers () {
   # We scan the "var/run/" directory for other process id's to kill
 
   # FIXME $path_run_dir or something
-  my $rundir= "$::glob_mysql_test_dir/var/run";
+  my $rundir= "$::opt_vardir/run";
 
   if ( -d $rundir )
   {

mysql-test/lib/mtr_report.pl

@@ -89,9 +89,10 @@ sub mtr_report_test_passed ($) {
   my $tinfo= shift;
 
   my $timer=  "";
-  if ( $::opt_timer and -f "$::glob_mysql_test_dir/var/log/timer" )
+  if ( $::opt_timer and -f "$::opt_vardir/log/timer" )
   {
-    $timer= mtr_fromfile("$::glob_mysql_test_dir/var/log/timer");
+    $timer= mtr_fromfile("$::opt_vardir/log/timer");
+    $::glob_tot_real_time += $timer;
     $timer= sprintf "%12s", $timer;
   }
   $tinfo->{'result'}= 'MTR_RES_PASSED';
@@ -177,8 +178,8 @@ sub mtr_report_stats ($) {
 
     # Report if there was any fatal warnings/errors in the log files
     #
-    unlink("$::glob_mysql_test_dir/var/log/warnings");
-    unlink("$::glob_mysql_test_dir/var/log/warnings.tmp");
+    unlink("$::opt_vardir/log/warnings");
+    unlink("$::opt_vardir/log/warnings.tmp");
     # Remove some non fatal warnings from the log files
 
 # FIXME what is going on ????? ;-)
@@ -196,11 +197,11 @@ sub mtr_report_stats ($) {
 #        found_error=1
 #      }
 #    done
-#    unlink("$::glob_mysql_test_dir/var/log/warnings.tmp");
+#    unlink("$::opt_vardir/log/warnings.tmp");
 #    if ( $found_error=  "1" )
 #      {
 #      print "WARNING: Got errors/warnings while running tests. Please examine\n"
-#      print "$::glob_mysql_test_dir/var/log/warnings for details.\n"
+#      print "$::opt_vardir/log/warnings for details.\n"
 #    }
 #  }
   }

mysql-test/mysql-test-run.sh

@@ -569,10 +569,7 @@ if [ x$SOURCE_DIST = x1 ] ; then
  NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm"
 
  if [ -n "$USE_PURIFY" ] ; then
-   PSUP="$MYSQL_TEST_DIR/purify.suppress"
-   echo "suppress UMR rw_read_held; mi_open; ha_myisam::open64; handler::ha_open; openfrm" >  $PSUP
-   echo "suppress UMR my_end; main" >> $PSUP
-   echo "suppress UMR _doprnt; fprintf; my_end; main" >> $PSUP
+   PSUP="$MYSQL_TEST_DIR/suppress.purify"
    PURIFYOPTIONS="-windows=no -log-file=%v.purifylog -append-logfile -add-suppression-files=$PSUP"
    if [ -f "${MYSQL_TEST}-purify" ] ; then
      MYSQL_TEST="${MYSQL_TEST}-purify"
@@ -1660,11 +1657,11 @@ run_testcase ()
       $ECHO "$RES$RES_SPACE [ pass ]   $TIMER"
     else
       # why the following ``if'' ? That is why res==1 is special ?
-      if [ $res = 2 ]; then
+      if [ $res = 62 ]; then
         skip_inc
 	$ECHO "$RES$RES_SPACE [ skipped ]"
       else
-        if [ $res -gt 2 ]; then
+        if [ $res -ne 1 ]; then
           $ECHO "mysqltest returned unexpected code $res, it has probably crashed" >> $TIMEFILE
         fi
 	total_inc

mysql-test/suppress.purify

+suppress UMR rw_read_held; mi_open; ha_myisam::open64; handler::ha_open; openfrm
+suppress UMR my_end; main
+suppress UMR _doprnt; fprintf; my_end; main
+suppress umr rw_read_held; mi_open
+suppress umr _putmsg; putmsg; _tx_sndudata
+suppress umr rw_read_held; Query_cache::store_query(THD*,st_table_list*); mysql_execute_command(THD*)
+suppress sig ...; _select; select; handle_connections_sockets; main; _start
+suppress sig ...; read; vio_read; my_real_read(st_net*,unsigned long*); my_net_read; do_command(THD*)
+suppress sig ...; read; vio_read; my_real_read(st_net*,unsigned long*); my_net_read; net_safe_read
+suppress sig ...; write; vio_write; net_real_write; net_write_buff(st_net*,const char*,unsigned long); my_net_write