diff options
author | Michael Widenius <monty@askmonty.org> | 2012-05-31 22:39:11 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2012-05-31 22:39:11 +0300 |
commit | 83c02f32375bcb38ba96c0e757f5a302ec32d76a (patch) | |
tree | ce769238f31169ed6f7c4e0397785efecad5bd59 /mysql-test/t/parser_not_embedded.test | |
parent | 59b4ee145452f57be86f1a983186d18e712138ef (diff) | |
download | mariadb-git-83c02f32375bcb38ba96c0e757f5a302ec32d76a.tar.gz |
Increased the version number to 10.0
- 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)
Diffstat (limited to 'mysql-test/t/parser_not_embedded.test')
-rw-r--r-- | mysql-test/t/parser_not_embedded.test | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/t/parser_not_embedded.test b/mysql-test/t/parser_not_embedded.test index 22e9ae5a140..3ebd23e888e 100644 --- a/mysql-test/t/parser_not_embedded.test +++ b/mysql-test/t/parser_not_embedded.test @@ -8,15 +8,15 @@ --write_file $MYSQLTEST_VARDIR/tmp/bug39559.sql select 2 as expected, /*!01000/**/*/ 2 as result; -select 1 as expected, /*!99998/**/*/ 1 as result; +select 1 as expected, /*!999998/**/*/ 1 as result; select 3 as expected, /*!01000 1 + */ 2 as result; -select 2 as expected, /*!99990 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, /*!99998 1 + /* 2 + */ 4 + */ 8 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 + /*!99998 8 + */ 2 + */ 4 as result; -select 4 as expected, /*!99998 1 + /*!99998 8 + */ 2 + */ 4 as result; -select 4 as expected, /*!99998 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 |