database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0

Browse Source 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2086/mysql-4.0
This commit is contained in:
vva@eagle.mysql.r18.ru
2003-12-18 18:07:39 -04:00
parent 07f520b73e d49ff0fd62
commit f70b3897c4
26 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/variables.result
View File

@ -231,7 +231,7 @@ Wrong argument type to variable 'convert_character_set'
set global autocommit=1;
Variable 'autocommit' is a LOCAL variable and can't be used with SET GLOBAL
select @@global.timestamp;
Variable 'timestamp' is a LOCAL variable and can't be used with SET GLOBAL
Variable 'timestamp' is a LOCAL variable
set @@version='';
Unknown system variable 'version'
set @@concurrent_insert=1;
@ -239,7 +239,7 @@ Variable 'concurrent_insert' is a GLOBAL variable and should be set with SET GLO
set @@global.sql_auto_is_null=1;
Variable 'sql_auto_is_null' is a LOCAL variable and can't be used with SET GLOBAL
select @@global.sql_auto_is_null;
Variable 'sql_auto_is_null' is a LOCAL variable and can't be used with SET GLOBAL
Variable 'sql_auto_is_null' is a LOCAL variable
set myisam_max_sort_file_size=100;
Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
set myisam_max_extra_sort_file_size=100;
@ -375,3 +375,5 @@ Unknown system variable 'xxxxxxxxxx'
select 1;
1
1
select @@session.key_buffer_size;
Variable 'key_buffer_size' is a GLOBAL variable

7
mysql-test/t/variables.test
View File

@ -139,7 +139,7 @@ set character set unknown;
set character set 0;
--error 1228
set global autocommit=1;
--error 1228
--error 1238
select @@global.timestamp;
--error 1193
set @@version='';
@ -147,7 +147,7 @@ set @@version='';
set @@concurrent_insert=1;
--error 1228
set @@global.sql_auto_is_null=1;
--error 1228
--error 1238
select @@global.sql_auto_is_null;
--error 1229
set myisam_max_sort_file_size=100;
@ -266,3 +266,6 @@ drop table t1,t2;
--error 1193
select @@xxxxxxxxxx;
select 1;
--error 1238
select @@session.key_buffer_size;