mirror of
https://github.com/MariaDB/server.git
synced 2025-11-21 06:21:35 +03: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)
77 lines
2.4 KiB
Plaintext
77 lines
2.4 KiB
Plaintext
** Setup **
|
|
|
|
SET @session_sql_big_selects = @@SESSION.sql_big_selects;
|
|
SET @session_max_join_size = @@SESSION.max_join_size;
|
|
SET @global_max_join_size = @@GLOBAL.max_join_size;
|
|
SET SQL_MAX_JOIN_SIZE=9;
|
|
Warnings:
|
|
Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 10.1. Please use '@@max_join_size' instead
|
|
CREATE TEMPORARY TABLE t1(a varchar(20) not null, b varchar(20));
|
|
CREATE TEMPORARY TABLE t2(a varchar(20) null, b varchar(20));
|
|
INSERT INTO t1 VALUES('aa','bb');
|
|
INSERT INTO t1 VALUES('aa1','bb');
|
|
INSERT INTO t1 VALUES('aa2','bb');
|
|
INSERT INTO t1 VALUES('aa3','bb');
|
|
INSERT INTO t1 VALUES('aa4','bb');
|
|
INSERT INTO t2 VALUES('aa','bb');
|
|
INSERT INTO t2 VALUES('aa1','bb');
|
|
INSERT INTO t2 VALUES('aa2','bb');
|
|
INSERT INTO t2 VALUES('aa3','bb');
|
|
INSERT INTO t2 VALUES('aa4','bb');
|
|
'#--------------------FN_DYNVARS_154_01-------------------------#'
|
|
Expected error "Too big select"
|
|
SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a;
|
|
ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET MAX_JOIN_SIZE=# if the SELECT is okay
|
|
Expected error The SELECT would examine more than MAX_JOIN_SIZE rows.
|
|
'#--------------------FN_DYNVARS_154_02-------------------------#'
|
|
SET SESSION SQL_BIG_SELECTS = 1;
|
|
SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a;
|
|
a b a b
|
|
aa bb aa bb
|
|
aa1 bb aa1 bb
|
|
aa2 bb aa2 bb
|
|
aa3 bb aa3 bb
|
|
aa4 bb aa4 bb
|
|
This should work
|
|
SET SESSION SQL_BIG_SELECTS = 0;
|
|
DELETE FROM t2 WHERE a = 'aa4';
|
|
SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a;
|
|
a b a b
|
|
aa bb aa bb
|
|
aa1 bb aa1 bb
|
|
aa2 bb aa2 bb
|
|
aa3 bb aa3 bb
|
|
This should work
|
|
'#--------------------FN_DYNVARS_154_03-------------------------#'
|
|
** Connecting con_int1 using root **
|
|
** Connection con_int1 **
|
|
SELECT @@SESSION.sql_big_selects;
|
|
@@SESSION.sql_big_selects
|
|
1
|
|
1 Expected
|
|
SET SESSION sql_big_selects = 0;
|
|
** Connecting con_int2 using root **
|
|
** Connection con_int2 **
|
|
SELECT @@SESSION.sql_big_selects;
|
|
@@SESSION.sql_big_selects
|
|
1
|
|
1 Expected
|
|
SET SESSION sql_big_selects = 1;
|
|
** Connection con_int1 **
|
|
SELECT @@SESSION.sql_big_selects;
|
|
@@SESSION.sql_big_selects
|
|
0
|
|
0 Expected
|
|
** Connection con_int2 **
|
|
SELECT @@SESSION.sql_big_selects;
|
|
@@SESSION.sql_big_selects
|
|
1
|
|
1 Expected
|
|
** Connection default **
|
|
Disconnecting Connections con_int1, con_int2
|
|
SET @@SESSION.sql_big_selects = @session_sql_big_selects;
|
|
SET @@SESSION.max_join_size = @session_max_join_size;
|
|
SET @@GLOBAL.max_join_size = @global_max_join_size;
|
|
DROP TABLE t1;
|
|
DROP TABLE t2;
|