Commit 24187180 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
parents 4c402032 38b7c29a

client/mysqltest.c

+646 −346

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/include/mysqltest_while.inc

0 → 100644
+137 −0
Original line number Diff line number Diff line 
let $1 = 10;

while ($1)

{

while ($1)

{

while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

  echo $1;

  dec $1;

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

mysql-test/mysql-test-run.pl

+5 −0
Original line number Diff line number Diff line
@@ -2484,6 +2484,11 @@ sub run_mysqltest ($) { 
    mysqld_arguments($args,'master',0,$tinfo->{'master_opt'},[]);

  }



  # ----------------------------------------------------------------------

  # export MYSQL_TEST variable containing <path>/mysqltest <args>

  # ----------------------------------------------------------------------

  $ENV{'MYSQL_TEST'}= "$exe_mysqltest " . join(" ", @$args);



  return mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,"");

}

mysql-test/mysql-test-run.sh

+1 −0
Original line number Diff line number Diff line
@@ -733,6 +733,7 @@ if [ x$USE_TIMER = x1 ] ; then 
fi

MYSQL_TEST_BIN=$MYSQL_TEST

MYSQL_TEST="$MYSQL_TEST $MYSQL_TEST_ARGS"

export MYSQL_TEST

GDB_CLIENT_INIT=$MYSQL_TMP_DIR/gdbinit.client

GDB_MASTER_INIT=$MYSQL_TMP_DIR/gdbinit.master

GDB_SLAVE_INIT=$MYSQL_TMP_DIR/gdbinit.slave

mysql-test/r/grant2.result

+9 −0
Original line number Diff line number Diff line
@@ -312,3 +312,12 @@ flush privileges; 
drop database mysqltest_1;

set password = password("changed");

ERROR 42000: Access denied for user ''@'localhost' to database 'mysql'

lock table mysql.user write;

 flush privileges;

 grant all on *.* to 'mysqltest_1'@'localhost';

unlock tables;

lock table mysql.user write;

 set password for 'mysqltest_1'@'localhost' = password('');

 revoke all on *.* from 'mysqltest_1'@'localhost';

unlock tables;

drop user 'mysqltest_1'@'localhost';