summaryrefslogtreecommitdiff
path: root/mysql-test/t/variables.test
diff options
context:
space:
mode:
authorunknown <jani@hynda.(none)>2003-05-13 19:34:51 +0300
committerunknown <jani@hynda.(none)>2003-05-13 19:34:51 +0300
commit496357a18069730b97b303d40d91a9ac3ec3783f (patch)
tree9d41f02e8299826a1b32e0e131402681199503cc /mysql-test/t/variables.test
parent4ccf66df87bfe9290d686e7abd585d3ffe1c1370 (diff)
downloadmariadb-git-496357a18069730b97b303d40d91a9ac3ec3783f.tar.gz
- Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342
- Fix for QNX: UNIX sockets available since 6.2.1 include/my_global.h: Fix for QNX: UNIX sockets available since 6.2.1 mysql-test/r/variables.result: Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 mysql-test/t/variables.test: Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 sql/mysqld.cc: Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 sql/set_var.cc: Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 sql/set_var.h: Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
Diffstat (limited to 'mysql-test/t/variables.test')
-rw-r--r--mysql-test/t/variables.test13
1 files changed, 8 insertions, 5 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 639a28edd38..c730f317fcb 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -69,10 +69,9 @@ show local variables like 'table_type';
show global variables like 'table_type';
set GLOBAL query_cache_size=100000;
-set myisam_max_sort_file_size=10000, GLOBAL myisam_max_sort_file_size=20000;
-show variables like 'myisam_max_sort_file_size';
+set GLOBAL myisam_max_sort_file_size=2000000;
show global variables like 'myisam_max_sort_file_size';
-set myisam_max_sort_file_size=default;
+set GLOBAL myisam_max_sort_file_size=default;
show variables like 'myisam_max_sort_file_size';
set global net_retry_count=10, session net_retry_count=10;
@@ -137,6 +136,10 @@ set @@concurrent_insert=1;
set @@global.sql_auto_is_null=1;
--error 1228
select @@global.sql_auto_is_null;
+--error 1229
+set myisam_max_sort_file_size=100;
+--error 1229
+set myisam_max_extra_sort_file_size=100;
# Test setting all variables
@@ -181,9 +184,9 @@ set max_tmp_tables=100;
set global max_user_connections=100;
select @@max_user_connections;
set global max_write_lock_count=100;
-set myisam_max_extra_sort_file_size=100;
+set global myisam_max_extra_sort_file_size=100;
select @@myisam_max_extra_sort_file_size;
-set myisam_max_sort_file_size=100;
+set global myisam_max_sort_file_size=100;
set myisam_sort_buffer_size=100;
set net_buffer_length=100;
set net_read_timeout=100;