diff options
author | monty@mysql.com <> | 2004-11-03 12:39:38 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2004-11-03 12:39:38 +0200 |
commit | 47bbf768d4bdb9ca0abd2ef94bd9a734dafeed50 (patch) | |
tree | 85bce6df7d0ce9d809ff3fc13fa4486590463d00 /mysql-test/t/sp-error.test | |
parent | afbe601302fc59c498437321b296ed6c8d360564 (diff) | |
download | mariadb-git-47bbf768d4bdb9ca0abd2ef94bd9a734dafeed50.tar.gz |
Fixes after merge with 4.1
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
Diffstat (limited to 'mysql-test/t/sp-error.test')
-rw-r--r-- | mysql-test/t/sp-error.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test index 08c8c7788ce..c04f8e6f9e9 100644 --- a/mysql-test/t/sp-error.test +++ b/mysql-test/t/sp-error.test @@ -19,7 +19,7 @@ create procedure syntaxerror(t int)| # Check that we get the right error, i.e. UDF declaration parses correctly, # but foo.so doesn't exist. -# QQ This generates an error message containing a misleading errno which +# This generates an error message containing a misleading errno which # might vary between systems (it usually doesn't have anything to do with # the actual failing dlopen()). #--error 1126 |