Commit 68045dfd authored by unknown's avatar unknown
Browse files

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

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
parents 86856939 e4fe90bf

client/mysqltest.c

+29 −25
Original line number Diff line number Diff line
@@ -585,6 +585,7 @@ static void die(const char *fmt, ...) 
    if (cur_file && cur_file != file_stack)

      fprintf(stderr, "In included file \"%s\": ",

              cur_file->file_name);

    if (start_lineno != 0)

      fprintf(stderr, "At line %u: ", start_lineno);

    vfprintf(stderr, fmt, args);

    fprintf(stderr, "\n");
@@ -618,7 +619,9 @@ static void verbose_msg(const char *fmt, ...) 


  va_start(args, fmt);



  fprintf(stderr, "mysqltest: At line %u: ", start_lineno);

  fprintf(stderr, "mysqltest: ");

  if (start_lineno > 0)

    fprintf(stderr, "At line %u: ", start_lineno);

  vfprintf(stderr, fmt, args);

  fprintf(stderr, "\n");

  va_end(args);
@@ -1068,8 +1071,8 @@ static void do_exec(struct st_query *query) 
          (query->expected_errno[i].code.errnum == status))

      {

        ok= 1;

        verbose_msg("command \"%s\" failed with expected error: %d",

                    cmd, status);

        DBUG_PRINT("info", ("command \"%s\" failed with expected error: %d",

                            cmd, status));

      }

    }

    if (!ok)
@@ -1354,9 +1357,7 @@ int do_sync_with_master2(long offset) 
  int rpl_parse;



  if (!master_pos.file[0])

  {

    die("Line %u: Calling 'sync_with_master' without calling 'save_master_pos'", start_lineno);

  }

    die("Calling 'sync_with_master' without calling 'save_master_pos'");

  rpl_parse= mysql_rpl_parse_enabled(mysql);

  mysql_disable_rpl_parse(mysql);
@@ -1366,14 +1367,13 @@ int do_sync_with_master2(long offset) 
wait_for_position:



  if (mysql_query(mysql, query_buf))

    die("line %u: failed in %s: %d: %s", start_lineno, query_buf,

	mysql_errno(mysql), mysql_error(mysql));

    die("failed in %s: %d: %s", query_buf, mysql_errno(mysql),

        mysql_error(mysql));



  if (!(last_result= res= mysql_store_result(mysql)))

    die("line %u: mysql_store_result() returned NULL for '%s'", start_lineno,

	query_buf);

    die("mysql_store_result() returned NULL for '%s'", query_buf);

  if (!(row= mysql_fetch_row(res)))

    die("line %u: empty result in %s", start_lineno, query_buf);

    die("empty result in %s", query_buf);

  if (!row[0])

  {

    /*
@@ -1381,10 +1381,7 @@ int do_sync_with_master2(long offset) 
      SLAVE has been issued ?

    */

    if (tries++ == 3)

    {

      die("line %u: could not sync with master ('%s' returned NULL)", 

          start_lineno, query_buf);

    }

      die("could not sync with master ('%s' returned NULL)", query_buf);

    sleep(1); /* So at most we will wait 3 seconds and make 4 tries */

    mysql_free_result(res);

    goto wait_for_position;
@@ -1430,10 +1427,9 @@ int do_save_master_pos() 
	mysql_errno(mysql), mysql_error(mysql));



  if (!(last_result =res = mysql_store_result(mysql)))

    die("line %u: mysql_store_result() retuned NULL for '%s'", start_lineno,

	query);

    die("mysql_store_result() retuned NULL for '%s'", query);

  if (!(row = mysql_fetch_row(res)))

    die("line %u: empty result in show master status", start_lineno);

    die("empty result in show master status");

  strnmov(master_pos.file, row[0], sizeof(master_pos.file)-1);

  master_pos.pos = strtoul(row[1], (char**) 0, 10);

  mysql_free_result(res); last_result=0;
@@ -2571,7 +2567,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      fn_format(buff, argument, "", "", 4);

      DBUG_ASSERT(cur_file == file_stack && cur_file->file == 0);

      if (!(cur_file->file=

            my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(MY_WME))))

            my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(0))))

	die("Could not open %s: errno = %d", buff, errno);

      cur_file->file_name= my_strdup(buff, MYF(MY_FAE));

      break;
@@ -4074,13 +4070,21 @@ int main(int argc, char **argv) 
    if (res_info.st_size)

      error|= (RESULT_CONTENT_MISMATCH | RESULT_LENGTH_MISMATCH);

  }

  if (result_file && ds_res.length && !error)

  if (ds_res.length && !error)

  {

    if (result_file)

    {

      if (!record)

        error |= check_result(&ds_res, result_file, q->require_file);

      else

        str_to_file(result_file, ds_res.str, ds_res.length);

    }

    else

    {

      // Print the result to stdout

      printf("%s", ds_res.str);

    }

  }

  dynstr_free(&ds_res);



  if (!silent)

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -2197,7 +2197,7 @@ sub run_mysqltest ($) { 
  $ENV{'MYSQL_TEST'}= "$exe_mysqltest " . join(" ", @$args);



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

  # Add args that should not go into the MYSQL_TEST environment var

  # Add arguments that should not go into the MYSQL_TEST env var

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



  mtr_add_arg($args, "-R");

mysql-test/r/mysqltest.result

+6 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ source database 
echo message echo message



mysqltest: At line 1: Empty variable

mysqltest: At line 1: command "false" failed

mysqltest: At line 1: Missing argument in exec

MySQL

"MySQL"
@@ -300,6 +301,7 @@ mysqltest: At line 1: First argument to dec must be a variable (start with $) 
mysqltest: At line 1: End of line junk detected: "1000"

mysqltest: At line 1: Missing arguments to system, nothing to do!

mysqltest: At line 1: Missing arguments to system, nothing to do!

mysqltest: At line 1: system command 'false' failed

test

test2

test3
@@ -343,6 +345,10 @@ mysqltest: At line 1: Wrong column number to replace_column in 'replace_column 1 
mysqltest: At line 1: Invalid integer argument "10!"

mysqltest: At line 1: End of line junk detected: "!"

mysqltest: At line 1: Invalid integer argument "a"

Output from mysqltest-x.inc

Output from mysqltest-x.inc

Output from mysqltest-x.inc

mysqltest: Could not open ./non_existing_file.inc: errno = 2

failing_statement;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing_statement' at line 1

failing_statement;

mysql-test/t/mysqltest.test

+9 −11
Original line number Diff line number Diff line
@@ -426,9 +426,8 @@ echo ; 
# ----------------------------------------------------------------------------



# Illegal use of exec

# Disabled, some shells prints the failed command regardless of pipes

#--error 1

#--exec echo "--exec ';' 2> /dev/null" | $MYSQL_TEST 2>&1

--error 1

--exec echo "--exec false" | $MYSQL_TEST 2>&1



--error 1

--exec echo "--exec " | $MYSQL_TEST 2>&1
@@ -675,9 +674,8 @@ system echo "hej" > /dev/null; 
--exec echo "system;" | $MYSQL_TEST 2>&1

--error 1

--exec echo "system $NONEXISTSINFVAREABLI;" | $MYSQL_TEST 2>&1

# Disabled, some shells prints the failed command regardless of pipes

#--error 1

#--exec echo "system NonExistsinfComamdn 2> /dev/null;" | $MYSQL_TEST 2>&1

--error 1

--exec echo "system false;" | $MYSQL_TEST 2>&1



--disable_abort_on_error

system NonExistsinfComamdn;
@@ -812,11 +810,11 @@ select "a" as col1, "c" as col2; 
# ----------------------------------------------------------------------------



# -x <file_name>, use the file specified after -x as the test file

#--exec $MYSQL_TEST < $MYSQL_TEST_DIR/include/mysqltest-x.inc 2>&1

#--exec $MYSQL_TEST -x $MYSQL_TEST_DIR/include/mysqltest-x.inc 2>&1

#--exec $MYSQL_TEST --result_file=$MYSQL_TEST_DIR/include/mysqltest-x.inc 2>&1

#--error 1

#--exec $MYSQL_TEST -x non_existing_file.inc 2>&1

--exec $MYSQL_TEST < $MYSQL_TEST_DIR/include/mysqltest-x.inc

--exec $MYSQL_TEST -x $MYSQL_TEST_DIR/include/mysqltest-x.inc

--exec $MYSQL_TEST --test_file=$MYSQL_TEST_DIR/include/mysqltest-x.inc

--error 1

--exec $MYSQL_TEST -x non_existing_file.inc 2>&1





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

mysys/my_init.c

+19 −6
Original line number Diff line number Diff line
@@ -127,11 +127,23 @@ my_bool my_init(void) 


void my_end(int infoflag)

{

  FILE *info_file;

  if (!(info_file=DBUG_FILE))

  /*

    this code is suboptimal to workaround a bug in

    Sun CC: Sun C++ 5.6 2004/06/02 for x86, and should not be

    optimized until this compiler is not in use anymore

  */

  FILE *info_file= DBUG_FILE;

  my_bool print_info= (info_file != stderr);

  DBUG_ENTER("my_end");

  if (!info_file)

  {

    info_file= stderr;

  DBUG_PRINT("info",("Shutting down"));

  if (infoflag & MY_CHECK_ERROR || info_file != stderr)

    print_info= 0;

  }



  DBUG_PRINT("info",("Shutting down: print_info: %d", print_info));

  if ((infoflag & MY_CHECK_ERROR) || print_info)



  {					/* Test if some file is left open */

    if (my_file_opened | my_stream_opened)

    {
@@ -141,7 +153,8 @@ void my_end(int infoflag) 
    }

  }

  my_once_free();

  if (infoflag & MY_GIVE_INFO || info_file != stderr)



  if ((infoflag & MY_GIVE_INFO) || print_info)

  {

#ifdef HAVE_GETRUSAGE

    struct rusage rus;