mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
83c02f3237
- Fixed code that was not ready for a major version number > 9 - Fixed test cases that assumed max major version number could be 9 Updated version number for depricated options (will be removed in a later commit) VERSION: Version number 10.0.0 client/mysqlbinlog.cc: Added support for major version numbers > 9 cmake/mysql_version.cmake: Added support for version numbers that is 0 mysql-test/r/comments.result: Modified test to handle version number 100000 mysql-test/r/func_system.result: Modified test to handle version number 100000 mysql-test/r/log_state.result: Updated depricated error message mysql-test/r/sp.result: Modified test to handle version number 100000 mysql-test/r/subselect4.result: Updated depricated error message mysql-test/r/variables.result: Updated depricated error message mysql-test/suite/rpl/r/rpl_conditional_comments.result: Modified test to handle version number 100000 mysql-test/suite/rpl/r/rpl_loaddatalocal.result: Modified test to handle version number 100000 mysql-test/suite/rpl/t/rpl_conditional_comments.test: Modified test to handle version number 100000 mysql-test/suite/rpl/t/rpl_loaddatalocal.test: Modified test to handle version number 100000 mysql-test/suite/sys_vars/r/debug_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/log_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/log_slow_queries_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/multi_range_count_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/sql_big_selects_func.result: Updated depricated error message mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/sql_max_join_size_func.result: Updated depricated error message mysql-test/t/comments.test: Modified test to handle version number 100000 mysql-test/t/file_contents.test: Modified test to handle version number 100000 mysql-test/t/func_system.test: Modified test to handle version number 100000 mysql-test/t/parser_not_embedded.test: Modified test to handle version number 100000 mysql-test/t/sp.test: Modified test to handle version number 100000 sql/mysqld.cc: Updated version number for depricated options (will be removed in a later commit) sql/slave.cc: Modified test to handle version number 100000 Better error messages sql/sql_lex.cc: Modified test to handle version number 100000 in comment syntax sql/sys_vars.cc: Updated version number for depricated options (will be removed in a later commit)
101 lines
2.5 KiB
Text
101 lines
2.5 KiB
Text
--source include/not_embedded.inc
|
|
|
|
###########################################################################
|
|
--echo #
|
|
--echo # Bug#39559: dump of stored procedures / functions with C-style
|
|
--echo # comment can't be read back
|
|
--echo #
|
|
|
|
--write_file $MYSQLTEST_VARDIR/tmp/bug39559.sql
|
|
select 2 as expected, /*!01000/**/*/ 2 as result;
|
|
select 1 as expected, /*!999998/**/*/ 1 as result;
|
|
select 3 as expected, /*!01000 1 + */ 2 as result;
|
|
select 2 as expected, /*!999990 1 + */ 2 as result;
|
|
select 7 as expected, /*!01000 1 + /* 8 + */ 2 + */ 4 as result;
|
|
select 8 as expected, /*!999998 1 + /* 2 + */ 4 + */ 8 as result;
|
|
select 7 as expected, /*!01000 1 + /*!01000 8 + */ 2 + */ 4 as result;
|
|
select 7 as expected, /*!01000 1 + /*!999998 8 + */ 2 + */ 4 as result;
|
|
select 4 as expected, /*!999998 1 + /*!999998 8 + */ 2 + */ 4 as result;
|
|
select 4 as expected, /*!999998 1 + /*!01000 8 + */ 2 + */ 4 as result;
|
|
select 7 as expected, /*!01000 1 + /*!01000 8 + /*!01000 error */ 16 + */ 2 + */ 4 as result;
|
|
select 4 as expected, /* 1 + /*!01000 8 + */ 2 + */ 4;
|
|
EOF
|
|
|
|
--exec $MYSQL --comment --force --table test <$MYSQLTEST_VARDIR/tmp/bug39559.sql
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/bug39559.sql
|
|
|
|
--echo # Bug#46527 "COMMIT AND CHAIN RELEASE does not make sense"
|
|
--echo #
|
|
--error ER_PARSE_ERROR
|
|
COMMIT AND CHAIN RELEASE;
|
|
|
|
COMMIT AND NO CHAIN RELEASE;
|
|
disconnect default;
|
|
connect(default, localhost, root,,);
|
|
|
|
COMMIT RELEASE;
|
|
disconnect default;
|
|
connect(default, localhost, root,,);
|
|
|
|
--error ER_PARSE_ERROR
|
|
COMMIT CHAIN RELEASE;
|
|
|
|
--error ER_PARSE_ERROR
|
|
COMMIT NO CHAIN RELEASE;
|
|
|
|
--error ER_PARSE_ERROR
|
|
COMMIT AND NO RELEASE;
|
|
--error ER_PARSE_ERROR
|
|
COMMIT AND RELEASE;
|
|
|
|
COMMIT NO RELEASE;
|
|
--error ER_PARSE_ERROR
|
|
COMMIT CHAIN NO RELEASE;
|
|
--error ER_PARSE_ERROR
|
|
COMMIT NO CHAIN NO RELEASE;
|
|
|
|
--error ER_PARSE_ERROR
|
|
COMMIT AND RELEASE CHAIN;
|
|
|
|
COMMIT AND NO CHAIN NO RELEASE;
|
|
|
|
--error ER_PARSE_ERROR
|
|
ROLLBACK AND CHAIN RELEASE;
|
|
|
|
ROLLBACK AND NO CHAIN RELEASE;
|
|
disconnect default;
|
|
connect(default, localhost, root,,);
|
|
|
|
ROLLBACK RELEASE;
|
|
disconnect default;
|
|
connect(default, localhost, root,,);
|
|
|
|
--error ER_PARSE_ERROR
|
|
ROLLBACK CHAIN RELEASE;
|
|
|
|
--error ER_PARSE_ERROR
|
|
ROLLBACK NO CHAIN RELEASE;
|
|
disconnect default;
|
|
connect(default, localhost, root,,);
|
|
|
|
--error ER_PARSE_ERROR
|
|
ROLLBACK AND NO RELEASE;
|
|
|
|
--error ER_PARSE_ERROR
|
|
ROLLBACK AND RELEASE;
|
|
|
|
ROLLBACK NO RELEASE;
|
|
|
|
--error ER_PARSE_ERROR
|
|
ROLLBACK CHAIN NO RELEASE;
|
|
|
|
--error ER_PARSE_ERROR
|
|
ROLLBACK NO CHAIN NO RELEASE;
|
|
--error ER_PARSE_ERROR
|
|
ROLLBACK AND RELEASE CHAIN;
|
|
|
|
ROLLBACK AND NO CHAIN NO RELEASE;
|
|
|
|
--echo #
|
|
--echo # End of 5.5 tests
|
|
--echo #
|