diff options
| author | unknown <monty@mysql.com> | 2004-05-28 02:04:07 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-28 02:04:07 +0300 |
| commit | 6645955abf228aa8bd5070651f7473fe81319803 (patch) | |
| tree | 57520d313686fb3d1f49b42e3164b95ea6835082 /mysql-test/t | |
| parent | 935a801a8a0d2bfadf65d60c7ee21f4253f1c373 (diff) | |
| parent | d1306dfa9df20972f20d1973042e0164a3183919 (diff) | |
| download | mariadb-git-6645955abf228aa8bd5070651f7473fe81319803.tar.gz | |
merge with 4.0 to get fix for hpux
configure.in:
Auto merged
innobase/os/os0file.c:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysql-test/r/variables.result:
merge fix
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/variables.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index a1faa4a4f71..60ebeb045f5 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -291,6 +291,7 @@ set global ft_boolean_syntax = @@init_connect; # variables are set set global myisam_max_sort_file_size=4294967296; +--replace_result 4294967296 MAX_FILE_SIZE 2146435072 MAX_FILE_SIZE show global variables like 'myisam_max_sort_file_size'; set global myisam_max_sort_file_size=default; |