mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
BUG#11316 mysqltest, problems when assigning value with '#' to $variable
- Fixed problem, only detect comment if the # is on start of line AND starting line of the current command. - Wrote tests for most of the mysqltest commands, added stricter checking of correct syntax. client/mysqltest.c: Updated mysql test to do stricter checking of syntax. For example when the number of arguments to a command is known, everything else is "junk" => die. Better checking of argument types. Added better debug printouts. Added improved printouts when wrong syntax is detected. Fix two bugs where mysqltest could not detect end of comamnd properly, as described in bug#11316 Fix segfault when performing too many source commands. Fix segfault when doing too many while loop levels. Add printout of line number in die Remove lineno and \n in all strings passed to die function. Decrese BLOCK_STACK_DEPTH from 32 to 16, does any test use more than 1 level? mysql-test/mysql-test-run.pl: export MYSQL_TEST environment variable, used from msyqltest.test mysql-test/mysql-test-run.sh: export MYSQL_TEST environment variable, used from msyqltest.test mysql-test/r/mysqltest.result: Updated test results mysql-test/r/rpl_flush_log_loop.result: Updated test result. Approved by lars mysql-test/t/innodb-deadlock.test: Correct wrong syntax Superfluos ; mysql-test/t/innodb-lock.test: Correct wrong syntax Superfluos ; mysql-test/t/mysqltest.test: Add several new tests for mysqltest. Foxus on detecting wrong syntax in test files. Use exec with expected error to execute test scripts that will kill mysqltest Change some negative test that were previously commented out to use the above method. mysql-test/t/ndb_autodiscover2.test: Correct wrong syntax Superfluos ; mysql-test/t/rpl_change_master.test: Correct wrong syntax Superfluos ; mysql-test/t/rpl_deadlock.test: Correct wrong syntax Superfluos ; mysql-test/t/rpl_drop_temp.test: Correct wrong syntax Superfluos ; mysql-test/t/rpl_flush_log_loop.test: Fix after detecting wrong syntax, missing ; Discussed with lars. mysql-test/t/rpl_insert_id.test: Missing ; mysql-test/t/rpl_rotate_logs.test: Correct wrong syntax Superfluos ; mysql-test/t/rpl_until.test: Missing delimiter mysql-test/include/mysqltest_while.inc: New file to test too many while levels
This commit is contained in:
unknown
@@ -3,6 +3,24 @@
|
||||
#
|
||||
# Test of mysqltest itself
|
||||
#
|
||||
# There are three rules that determines what belong to each command
|
||||
# 1. A normal command is delimited by the <delimiter> which by default is
|
||||
# set to ';'
|
||||
#
|
||||
# ex: | select *
|
||||
# | from t1;
|
||||
# |
|
||||
# Command: "select * from t1"
|
||||
#
|
||||
# 2. Special case is a line that starts with "--", this is a comment
|
||||
# ended when the new line character is reached. But the first word
|
||||
# in the comment may contain a valid command, which then will be
|
||||
# executed. This can be useful when sending commands that
|
||||
# contains <delimiter>
|
||||
#
|
||||
# 3. Special case is also a line that starts with '#' which is treated
|
||||
# as a comment and will be ended by new line character
|
||||
#
|
||||
# ============================================================================
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
@@ -37,7 +55,9 @@ select otto from (select 1 as otto) as t1;
|
||||
|
||||
# expectation <> response
|
||||
#--error 0
|
||||
#select friedrich from (select 1 as otto) as t1;
|
||||
#select friedrich from (select 1 as otto) as t1
|
||||
--error 1
|
||||
--exec echo "select friedrich from (select 1 as otto) as t1;" | $MYSQL_TEST 2>&1
|
||||
|
||||
# expectation = response
|
||||
--error 1054
|
||||
@@ -65,6 +85,9 @@ select otto from (select 1 as otto) as t1;
|
||||
#!S42S22 select otto from (select 1 as otto) as t1;
|
||||
#--error S42S22
|
||||
#select otto from (select 1 as otto) as t1;
|
||||
--error 1
|
||||
--exec echo "error S42S22; select otto from (select 1 as otto) as t1;" | $MYSQL_TEST 2>&1
|
||||
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
@@ -80,7 +103,8 @@ select friedrich from (select 1 as otto) as t1;
|
||||
#!S00000 select friedrich from (select 1 as otto) as t1;
|
||||
#--error S00000
|
||||
#select friedrich from (select 1 as otto) as t1;
|
||||
|
||||
--error 1
|
||||
--exec echo "error S00000; select friedrich from (select 1 as otto) as t1;" | $MYSQL_TEST 2>&1
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# test cases for $mysql_errno
|
||||
@@ -262,6 +286,8 @@ eval select $mysql_errno as "after_!errno_masked_error" ;
|
||||
# select 3 from t1 ;
|
||||
# --error 1000
|
||||
# select 3 from t1 ;
|
||||
--error 1
|
||||
--exec echo "disable_abort_on_error; error 1000; select 3 from t1; error 1000; select 3 from t1;" | $MYSQL_TEST 2>&1
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Switch the abort on error on and check the effect on $mysql_errno
|
||||
@@ -286,3 +312,359 @@ select 3 from t1 ;
|
||||
#select 3 from t1 ;
|
||||
#
|
||||
#select 3 from t1 ;
|
||||
--error 1
|
||||
--exec echo "disable_abort_on_error; enable_abort_on_error; error 1064; select 3 from t1; select 3 from t1;" | $MYSQL_TEST 2>&1
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test comments
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# This is a comment
|
||||
# This is a ; comment
|
||||
# This is a -- comment
|
||||
-- This is also a comment
|
||||
-- # This is also a comment
|
||||
-- This is also a ; comment
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test comments with embedded command
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
--echo hello
|
||||
-- echo hello
|
||||
-- echo ;;;;;;;;
|
||||
|
||||
--echo # MySQL: -- The
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test detect end of line "junk"
|
||||
# Most likely causes by a missing delimiter
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# Too many parameters to function
|
||||
--error 1
|
||||
--exec echo "sleep 5 6;" | $MYSQL_TEST 2>&1
|
||||
|
||||
# Too many parameters to function
|
||||
--error 1
|
||||
--exec echo "--sleep 5 6" | $MYSQL_TEST 2>&1
|
||||
|
||||
#
|
||||
# Missing delimiter
|
||||
# The comment will be "sucked into" the sleep command since
|
||||
# delimiter is missing until after "show status"
|
||||
--error 1
|
||||
--exec echo -e "sleep 4\n # A comment\nshow status;" | $MYSQL_TEST 2>&1
|
||||
|
||||
#
|
||||
# Extra delimiter
|
||||
#
|
||||
--error 1
|
||||
--exec echo "--sleep 4;" | $MYSQL_TEST 2>&1
|
||||
|
||||
|
||||
# Allow trailing # comment
|
||||
--sleep 1 # Wait for insert delayed to be executed.
|
||||
--sleep 1 # Wait for insert delayed to be executed.
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test echo command
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
echo MySQL;
|
||||
echo "MySQL";
|
||||
echo MySQL: The world''s most popular open source database;
|
||||
echo "MySQL: The world's most popular open source database";
|
||||
|
||||
echo MySQL: The world''s
|
||||
most popular open
|
||||
source database;
|
||||
|
||||
echo # MySQL: The world''s
|
||||
# most popular open
|
||||
# source database;
|
||||
|
||||
echo - MySQL: The world''s
|
||||
- most popular open
|
||||
- source database;
|
||||
|
||||
echo - MySQL: The world''s
|
||||
-- most popular open
|
||||
-- source database;
|
||||
|
||||
echo # MySQL: The
|
||||
--world''s
|
||||
# most popular
|
||||
-- open
|
||||
- source database;
|
||||
|
||||
echo "MySQL: The world's most popular; open source database";
|
||||
echo "MySQL: The world's most popular ; open source database";
|
||||
echo "MySQL: The world's most popular ;open source database";
|
||||
echo echo message echo message;
|
||||
|
||||
|
||||
echo ;
|
||||
|
||||
# Illegal use of echo
|
||||
|
||||
--error 1
|
||||
--exec echo "echo $;" | $MYSQL_TEST 2>&1
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test exec command
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# Illegal use of exec
|
||||
--error 1
|
||||
--exec echo "--exec ;" | $MYSQL_TEST 2>&1
|
||||
|
||||
--error 1
|
||||
--exec echo "--exec " | $MYSQL_TEST 2>&1
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test let command
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
let $message=MySQL;
|
||||
echo $message;
|
||||
|
||||
let $message="MySQL";
|
||||
echo $message;
|
||||
|
||||
let $message= MySQL: The
|
||||
world''s most
|
||||
popular open
|
||||
source database;
|
||||
echo $message;
|
||||
|
||||
let $message= # MySQL: The
|
||||
# world''s most
|
||||
# popular open
|
||||
# source database;
|
||||
echo $message;
|
||||
|
||||
let $message= -- MySQL: The
|
||||
-- world''s most
|
||||
-- popular open
|
||||
-- source database;
|
||||
echo $message;
|
||||
|
||||
let $message= # MySQL: The
|
||||
- world''s most
|
||||
-- popular open
|
||||
# source database;
|
||||
echo $message;
|
||||
|
||||
echo '$message';
|
||||
echo "$message";
|
||||
|
||||
let $1=hej;
|
||||
echo $1;
|
||||
|
||||
let $1 =hej ;
|
||||
echo $1;
|
||||
|
||||
let $1 = hej;
|
||||
echo $1;
|
||||
|
||||
|
||||
# Test illegal uses of let
|
||||
|
||||
--error 1
|
||||
--exec echo "let ;" | $MYSQL_TEST 2>&1
|
||||
|
||||
--error 1
|
||||
--exec echo "let $=hi;" | $MYSQL_TEST 2>&1
|
||||
|
||||
--error 1
|
||||
--exec echo "let hi=hi;" | $MYSQL_TEST 2>&1
|
||||
|
||||
--error 1
|
||||
--exec echo "let $1 hi;" | $MYSQL_TEST 2>&1
|
||||
|
||||
--error 1
|
||||
--exec echo "let $m hi;" | $MYSQL_TEST 2>&1
|
||||
|
||||
--error 1
|
||||
--exec echo "let $hi;" | $MYSQL_TEST 2>&1
|
||||
|
||||
--error 1
|
||||
--exec echo "let $ hi;" | $MYSQL_TEST 2>&1
|
||||
|
||||
--error 1
|
||||
--exec echo "let =hi;" | $MYSQL_TEST 2>&1
|
||||
|
||||
--error 1
|
||||
--exec echo "let hi;" | $MYSQL_TEST 2>&1
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test source command
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# Test illegal uses of source
|
||||
|
||||
--error 1
|
||||
--exec echo "source ;" | $MYSQL_TEST 2>&1
|
||||
|
||||
--error 1
|
||||
--exec echo "source non_existingFile;" | $MYSQL_TEST 2>&1
|
||||
|
||||
# Too many source
|
||||
--exec echo "source var/tmp/recursive.sql;" > var/tmp/recursive.sql
|
||||
--error 1
|
||||
--exec echo "source var/tmp/recursive.sql;" | $MYSQL_TEST 2>&1
|
||||
|
||||
# Source a file with error
|
||||
--exec echo "garbage ;" > var/tmp/error.sql
|
||||
--error 1
|
||||
--exec echo "source var/tmp/error.sql;" | $MYSQL_TEST 2>&1
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test sleep command
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
sleep 0.5;
|
||||
sleep 1;
|
||||
real_sleep 1;
|
||||
|
||||
# Missing parameter
|
||||
--error 1
|
||||
--exec echo "sleep ;" | $MYSQL_TEST 2>&1
|
||||
|
||||
# Illegal parameter
|
||||
--error 1
|
||||
--exec echo "sleep abc;" | $MYSQL_TEST 2>&1
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test inc
|
||||
# ----------------------------------------------------------------------------
|
||||
inc $i;
|
||||
echo $i;
|
||||
inc $i;
|
||||
echo $i;
|
||||
let $i=100;
|
||||
inc $i;
|
||||
echo $i;
|
||||
|
||||
let $i=hej;
|
||||
echo $i;
|
||||
inc $i;
|
||||
echo $i;
|
||||
|
||||
--error 1
|
||||
--exec echo "inc;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo "inc i;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo "let \$i=100; inc \$i 1000; echo \$i;" | $MYSQL_TEST 2>&1
|
||||
|
||||
inc $i; inc $i; inc $i; --echo $i
|
||||
echo $i;
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test dec
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
dec $d;
|
||||
echo $d;
|
||||
dec $d;
|
||||
echo $d;
|
||||
let $d=100;
|
||||
dec $d;
|
||||
echo $d;
|
||||
|
||||
let $d=hej;
|
||||
echo $d;
|
||||
dec $d;
|
||||
echo $d;
|
||||
|
||||
--error 1
|
||||
--exec echo "dec;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo "dec i;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo "let \$i=100; dec \$i 1000; echo \$i;" | $MYSQL_TEST 2>&1
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test system
|
||||
# ----------------------------------------------------------------------------
|
||||
system ls > /dev/null;
|
||||
system echo "hej" > /dev/null;
|
||||
--system ls > /dev/null
|
||||
--system echo "hej" > /dev/null;
|
||||
|
||||
--error 1
|
||||
--exec echo "system;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo "system $NONEXISTSINFVAREABLI;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo "system NonExistsinfComamdn;" | $MYSQL_TEST 2>&1
|
||||
|
||||
--disable_abort_on_error
|
||||
system NonExistsinfComamdn;
|
||||
--enable_abort_on_error
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test delimiter
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
delimiter stop;
|
||||
echo teststop
|
||||
delimiter ;stop
|
||||
echo test2;
|
||||
--delimiter stop
|
||||
echo test3stop
|
||||
--delimiter ;
|
||||
echo test4;
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test while, { and }
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
let $i=1;
|
||||
while ($i)
|
||||
{
|
||||
echo $i;
|
||||
dec $i;
|
||||
}
|
||||
# One liner
|
||||
#let $i=1;while ($i){echo $i;dec $i;}
|
||||
|
||||
|
||||
|
||||
# Exceed max nesting level
|
||||
--error 1
|
||||
--exec echo "source include/mysqltest_while.inc;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo "while \$i;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo "while (\$i;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo "let \$i=1; while (\$i) dec \$i;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo "};" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo "end;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo "{;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo -e "while (0)\necho hej;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo -e "while (0)\n{echo hej;" | $MYSQL_TEST 2>&1
|
||||
--error 1
|
||||
--exec echo -e "while (0){\n echo hej;" | $MYSQL_TEST 2>&1
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# TODO Test queries, especially their errormessages... so it's easy to debug
|
||||
# new scripts and diagnose errors
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user