Commit f53de1f2 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 9bd02618 3ae91695

client/mysqltest.c

+7 −5
Original line number Diff line number Diff line
@@ -2169,8 +2169,10 @@ int read_line(char *buf, int size) 
    if (feof(cur_file->file))

    {

  found_eof:

      if (cur_file->file != stdin)

      if (cur_file->file != stdin){

	my_fclose(cur_file->file, MYF(0));

        cur_file->file= 0;

      }

      my_free((gptr)cur_file->file_name, MYF(MY_ALLOW_ZERO_PTR));

      cur_file->file_name= 0;

      lineno--;
@@ -2556,10 +2558,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
	argument= buff;

      }

      fn_format(buff, argument, "", "", 4);

      DBUG_ASSERT(cur_file->file == 0);

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

      if (!(cur_file->file=

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

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

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

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

      break;

    }

  case 'm':
@@ -3746,9 +3749,8 @@ int main(int argc, char **argv) 
			embedded_server_args,

			(char**) embedded_server_groups))

    die("Can't initialize MySQL server");

  if (cur_file == file_stack)

  if (cur_file == file_stack && cur_file->file == 0)

  {

    DBUG_ASSERT(cur_file->file == 0);

    cur_file->file= stdin;

    cur_file->file_name= my_strdup("<stdin>", MYF(MY_WME));

  }

mysql-test/include/mysqltest-x.inc

0 → 100644
+2 −0
Original line number Diff line number Diff line 
echo Output from mysqltest-x.inc;

mysql-test/r/mysqltest.result

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



mysqltest: At line 1: Empty variable

mysqltest: At line 1: command "';' 2> /dev/null" failed

mysqltest: At line 1: Missing argument in exec

MySQL

"MySQL"
@@ -301,7 +300,6 @@ 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 'NonExistsinfComamdn 2> /dev/null' failed

test

test2

test3

mysql-test/t/mysqltest.test

+35 −8
Original line number Diff line number Diff line
@@ -358,8 +358,11 @@ select 3 from t1 ; 
# Missing delimiter

# The comment will be "sucked into" the sleep command since

# delimiter is missing until after "show status"

--system echo "sleep 4" > var/log/mysqltest.sql

--system echo "# A comment" >> var/log/mysqltest.sql

--system echo "show status;" >> var/log/mysqltest.sql

--error 1

--exec echo -e "sleep 4\n # A comment\nshow status;" | $MYSQL_TEST 2>&1

--exec $MYSQL_TEST < var/log/mysqltest.sql 2>&1



#

# Extra delimiter
@@ -423,8 +426,9 @@ echo ; 
# ----------------------------------------------------------------------------



# Illegal use of exec

--error 1

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

# 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 " | $MYSQL_TEST 2>&1
@@ -671,8 +675,9 @@ system echo "hej" > /dev/null; 
--exec echo "system;" | $MYSQL_TEST 2>&1

--error 1

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

--error 1

--exec echo "system NonExistsinfComamdn 2> /dev/null;" | $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



--disable_abort_on_error

system NonExistsinfComamdn;
@@ -722,12 +727,21 @@ while ($i) 
--exec echo "end;" | $MYSQL_TEST 2>&1

--error 1

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



--system echo "while (0)" > var/log/mysqltest.sql

--system echo "echo hej;" >> var/log/mysqltest.sql

--error 1

--exec echo -e "while (0)\necho hej;" | $MYSQL_TEST 2>&1

--exec $MYSQL_TEST < var/log/mysqltest.sql 2>&1



--system echo "while (0)" > var/log/mysqltest.sql

--system echo "{echo hej;" >> var/log/mysqltest.sql

--error 1

--exec echo -e "while (0)\n{echo hej;" | $MYSQL_TEST 2>&1

--exec $MYSQL_TEST < var/log/mysqltest.sql 2>&1



--system echo "while (0){" > var/log/mysqltest.sql

--system echo "echo hej;" >> var/log/mysqltest.sql

--error 1

--exec echo -e "while (0){\n echo hej;" | $MYSQL_TEST 2>&1

--exec $MYSQL_TEST < var/log/mysqltest.sql 2>&1



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

# Test error messages returned from comments starting with a command
@@ -792,6 +806,19 @@ select "a" as col1, "c" as col2; 
--error 1

--exec echo "save_master_pos; sync_with_master a;" | $MYSQL_TEST 2>&1





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

# Test mysqltest arguments

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



# -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





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

# TODO Test queries, especially their errormessages... so it's easy to debug 

# new scripts and diagnose errors

mysql-test/t/openssl_1.test

+4 −4
Original line number Diff line number Diff line
@@ -20,22 +20,22 @@ connect (con4,localhost,ssl_user4,,); 


connection con1;

select * from t1;

--error 1044;

--error 1044

delete from t1;



connection con2;

select * from t1;

--error 1044;

--error 1044

delete from t1;



connection con3;

select * from t1;

--error 1044;

--error 1044

delete from t1;



connection con4;

select * from t1;

--error 1044;

--error 1044

delete from t1;



connection default;