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/r/variables.result | |
| 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/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index e57f82aca26..658a3ffa7a1 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -220,7 +220,7 @@ select * from information_schema.global_variables where variable_name like 'myis VARIABLE_NAME VARIABLE_VALUE MYISAM_MAX_SORT_FILE_SIZE 1048576 set GLOBAL myisam_max_sort_file_size=default; -show variables like 'myisam_max_sort_file_size'; +show global variables like 'myisam_max_sort_file_size'; Variable_name Value myisam_max_sort_file_size FILE_SIZE select * from information_schema.session_variables where variable_name like 'myisam_max_sort_file_size'; |