Commit 74ee3a12 authored by unknown's avatar unknown
Browse files

Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
parents 046530d5 8d5f0fcd

client/mysqltest.c

+4 −3
Original line number Diff line number Diff line
@@ -1647,18 +1647,19 @@ int do_sleep(struct st_query *query, my_bool real_sleep) 
  char *p= query->first_argument;

  char *sleep_start, *sleep_end= query->end;

  double sleep_val;

  char *cmd = (real_sleep ? "real_sleep" : "sleep");



  while (my_isspace(charset_info, *p))

    p++;

  if (!*p)

    die("Missing argument to sleep");

    die("Missing argument to %s", cmd);

  sleep_start= p;

  /* Check that arg starts with a digit, not handled by my_strtod */

  if (!my_isdigit(charset_info, *sleep_start))

    die("Invalid argument to sleep \"%s\"", query->first_argument);

    die("Invalid argument to %s \"%s\"", cmd, query->first_argument);

  sleep_val= my_strtod(sleep_start, &sleep_end, &error);

  if (error)

    die("Invalid argument to sleep \"%s\"", query->first_argument);

    die("Invalid argument to %s \"%s\"", cmd, query->first_argument);



  /* Fixed sleep time selected by --sleep option */

  if (opt_sleep && !real_sleep)

mysql-test/README

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ conflict with it. 
All tests must pass. If one or more of them fail on your system, please

read the following manual section of how to report the problem:



http://dev.mysql.com/doc/mysql/en/MySQL_test_suite.html

http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html





You can create your own test cases. To create a test case:

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ show_failed_diff () 
    $DIFF -c $result_file $reject_file

    echo "-------------------------------------------------------"

    echo "Please follow the instructions outlined at"

    echo "http://www.mysql.com/doc/en/Reporting_mysqltest_bugs.html"

    echo "http://dev.mysql.com/doc/mysql/en/reporting-mysqltest-bugs.html"

    echo "to find the reason to this problem and how to report this."

    echo ""

  fi
@@ -990,7 +990,7 @@ report_stats () { 
        $ECHO "The log files in $MY_LOG_DIR may give you some hint"

	$ECHO "of what went wrong."

	$ECHO "If you want to report this error, please read first the documentation at"

        $ECHO "http://www.mysql.com/doc/en/MySQL_test_suite.html"

        $ECHO "http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html"

    fi



    if [ $USE_RUNNING_SERVER -eq 0 ]

mysql-test/r/mysqltest.result

+2 −0
Original line number Diff line number Diff line
@@ -297,7 +297,9 @@ here is the sourced script 
In loop

here is the sourced script

mysqltest: At line 1: Missing argument to sleep

mysqltest: At line 1: Missing argument to real_sleep

mysqltest: At line 1: Invalid argument to sleep "abc"

mysqltest: At line 1: Invalid argument to real_sleep "abc"

1

2

101