diff options
| author | unknown <serg@janus.mylan> | 2007-12-19 22:35:46 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-12-19 22:35:46 +0100 |
| commit | 82aee4efdb75eca30b50a562e8b0dc2b1a1e12ee (patch) | |
| tree | ccfa40f14c56d2ba4ecb1542769c0a4ac80d7d5a /mysql-test/t/variables.test | |
| parent | 25fa7692ad6550eb1e400be6d288e2f0c75dcd42 (diff) | |
| parent | 154933ec02af9281e84892a3d41edaaafa868cb7 (diff) | |
| download | mariadb-git-82aee4efdb75eca30b50a562e8b0dc2b1a1e12ee.tar.gz | |
Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
mysql-test/r/variables.result:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/t/variables.test:
merged
Diffstat (limited to 'mysql-test/t/variables.test')
| -rw-r--r-- | mysql-test/t/variables.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index c1580390f63..dd332a4f528 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -141,9 +141,9 @@ set GLOBAL myisam_max_sort_file_size=2000000; show global variables like 'myisam_max_sort_file_size'; select * from information_schema.global_variables where variable_name like 'myisam_max_sort_file_size'; set GLOBAL myisam_max_sort_file_size=default; ---replace_result 2147483647 FILE_SIZE 9223372036854775807 FILE_SIZE -show variables like 'myisam_max_sort_file_size'; ---replace_result 2147483647 FILE_SIZE 9223372036854775807 FILE_SIZE +--replace_result 9223372036853727232 FILE_SIZE 2146435072 FILE_SIZE +show global variables like 'myisam_max_sort_file_size'; +--replace_result 9223372036853727232 FILE_SIZE 2146435072 FILE_SIZE select * from information_schema.session_variables where variable_name like 'myisam_max_sort_file_size'; set global net_retry_count=10, session net_retry_count=10; |