Commit aa778612 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
parents 04b56a3e f4425b50

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,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, ...)

mysql-test/mysql-test-run.sh

+3 −6
Original line number Diff line number Diff line
@@ -586,10 +586,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"
@@ -1705,11 +1702,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

0 → 100644
+10 −0
Original line number Diff line number Diff line 
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