Commit 6ee54d73 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 

into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
client/mysqltest.c:
  Manual merge
mysql-test/t/mysqltest.test:
  Manual merge
parents 3aa2467e 126e351c

client/mysqltest.c

+701 −405

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
@@ -2197,6 +2197,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
@@ -714,6 +714,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/mysqltest.result

+218 −5
Original line number Diff line number Diff line
@@ -7,18 +7,16 @@ otto 
select otto from (select 1 as otto) as t1;

otto

1

mysqltest: At line 1: query 'select friedrich from (select 1 as otto) as t1' failed: 1054: Unknown column 'friedrich' in 'field list'

select friedrich from (select 1 as otto) as t1;

ERROR 42S22: Unknown column 'friedrich' in 'field list'

select otto from (select 1 as otto) as t1;

otto

1

select otto from (select 1 as otto) as t1;

otto

1

select friedrich from (select 1 as otto) as t1;

ERROR 42S22: Unknown column 'friedrich' in 'field list'

mysqltest: At line 1: query 'select otto from (select 1 as otto) as t1' succeeded - should have failed with sqlstate 42S22...

select friedrich from (select 1 as otto) as t1;

ERROR 42S22: Unknown column 'friedrich' in 'field list'

mysqltest: At line 1: query 'select friedrich from (select 1 as otto) as t1' failed with wrong sqlstate 42S22 instead of 00000...

select otto from (select 1 as otto) as t1;

otto

1
@@ -135,6 +133,8 @@ ERROR 42S02: Table 'test.t1' doesn't exist 
select 1146 as "after_!errno_masked_error" ;

after_!errno_masked_error

1146

mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146 instead of 1000...

mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146 instead of 1000...

garbage ;

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 'garbage' at line 1

select 1064 as "after_--enable_abort_on_error" ;
@@ -142,3 +142,216 @@ after_--enable_abort_on_error 
1064

select 3 from t1 ;

ERROR 42S02: Table 'test.t1' doesn't exist

mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146 instead of 1064...

mysqltest: At line 1: query 'select 3 from t1' failed: 1146: Table 'test.t1' doesn't exist

hello

hello

;;;;;;;;

# MySQL: -- The

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

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

mysqltest: At line 1: Missing delimiter

mysqltest: At line 1: Extra delimiter ";" found

MySQL

"MySQL"

MySQL: The world''s most popular open source database

"MySQL: The world's most popular open source database"

MySQL: The world''s

most popular open

source database

# MySQL: The world''s

# most popular open

# source database

- MySQL: The world''s

- most popular open

- source database

- MySQL: The world''s

-- most popular open

-- source database

# MySQL: The

--world''s

# most popular

-- open

- source database

"MySQL: The world's most popular; open source database"

"MySQL: The world's most popular ; open source database"

"MySQL: The world's most popular ;open source database"

echo message echo message



mysqltest: At line 1: Empty variable

sh: -c: line 0: syntax error near unexpected token `;'

sh: -c: line 0: `;'

mysqltest: At line 1: command ";" failed

mysqltest: At line 1: Missing argument in exec

MySQL

"MySQL"

MySQL: The

world''s most

popular open

source database

# MySQL: The

# world''s most

# popular open

# source database

-- MySQL: The

-- world''s most

-- popular open

-- source database

# MySQL: The

- world''s most

-- popular open

# source database

'$message'

"$message"

hej

hej 

hej

1





a long variable content

a long variable content

a long $where variable content



mysqltest: At line 1: Missing arguments to let

mysqltest: At line 1: Missing variable name in let

mysqltest: At line 1: Variable name in hi=hi does not start with '$'

mysqltest: At line 1: Missing assignment operator in let

mysqltest: At line 1: Missing assignment operator in let

mysqltest: At line 1: Missing arguments to let

mysqltest: At line 1: Missing variable name in let

mysqltest: At line 1: Variable name in =hi does not start with '$'

mysqltest: At line 1: Missing assignment operator in let

mysqltest: At line 1: Missing file name in source

mysqltest: At line 1: Could not open file ./non_existingFile

mysqltest: In included file "./var/tmp/recursive.sql": At line 1: Source directives are nesting too deep

mysqltest: In included file "./var/tmp/error.sql": At line 1: query 'garbage ' failed: 1064: 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 'garbage' at line 1



2 = outer loop variable after while

here is the sourced script



2 = outer loop variable before dec



1 = outer loop variable after dec



1 = outer loop variable after while

here is the sourced script



1 = outer loop variable before dec



0 = outer loop variable after dec



2 = outer loop variable after while

here is the sourced script



2 = outer loop variable before dec



1 = outer loop variable after dec



1 = outer loop variable after while

here is the sourced script



1 = outer loop variable before dec



0 = outer loop variable after dec



In loop

here is the sourced script



In loop

here is the sourced script



In loop

here is the sourced script



In loop

here is the sourced script



In loop

here is the sourced script



In loop

here is the sourced script



In loop

here is the sourced script



In loop

here is the sourced script



In loop

here is the sourced script

mysqltest: At line 1: Missing argument to sleep

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

1

2

101

hej

1

mysqltest: At line 1: Missing arguments to inc

mysqltest: At line 1: First argument to inc must be a variable (start with $)

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

4

4

-1

-2

99

hej

-1

mysqltest: At line 1: Missing arguments to dec

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!

sh: NonExistsinfComamdn: command not found

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

test

test2

test3

test4

1

mysqltest: In included file "./include/mysqltest_while.inc": At line 64: Nesting too deeply

mysqltest: At line 1: missing '(' in while

mysqltest: At line 1: missing ')' in while

mysqltest: At line 1: Missing '{' after while. Found "dec $i"

mysqltest: At line 1: Stray '}' - end of block before beginning

mysqltest: At line 1: Stray 'end' command - end of block before beginning

mysqltest: At line 1: query '' failed: 1065: Query was empty

mysqltest: At line 1: Missing '{' after while. Found "echo hej"

mysqltest: At line 3: Missing end of block

mysqltest: At line 1: Missing newline between while and '{'

mysqltest: At line 1: missing '(' in if

mysqltest: At line 1: Stray 'end' command - end of block before beginning

select "b" bs col1, "c" bs col2;

col1	col2

b	c

seledt "b" bs dol1, "d" bs dol2;

dol1	dol2

b	d

mysqltest: At line 1: Wrong number of arguments to replace_result in 'replace_result a'

mysqltest: At line 1: Wrong number of arguments to replace_result in 'replace_result a;'

mysqltest: At line 1: Wrong number of arguments to replace_result in 'replace_result a'

mysqltest: At line 1: Wrong number of arguments to replace_result in 'replace_result a '

mysqltest: At line 1: Wrong number of arguments to replace_result in 'replace_result a b c'

mysqltest: At line 1: Wrong number of arguments to replace_result in 'replace_result a b c '

select "a" as col1, "c" as col2;

col1	col2

b	c

select "a" as col1, "c" as col2;

col1	col2

b	d

mysqltest: At line 1: Wrong column number to replace_column in 'replace_column a'

mysqltest: At line 1: Wrong number of arguments to replace_column in 'replace_column 1'

mysqltest: At line 1: Wrong column number to replace_column in 'replace_column a b'

mysqltest: At line 1: Wrong column number to replace_column in 'replace_column a 1'

mysqltest: At line 1: Wrong column number to replace_column in 'replace_column 1 b c '

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"

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;

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

SELECT 1 as a;

a

1