diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-05-04 19:04:09 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-05-04 19:04:09 -0400 |
| commit | 2b7cad650329bff5021a1083696d06dee30f1b26 (patch) | |
| tree | 0a9f793ee00fb5b1cc95e9a6bbf101e775f4de92 /mysql-test | |
| parent | b9985ebae88875e81a8e329362c07d5eb1c70b54 (diff) | |
| parent | d64e63b36094aec1fc3c3132716d55322ac97dbf (diff) | |
| download | mariadb-git-2b7cad650329bff5021a1083696d06dee30f1b26.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my41-bug27976
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my50-bug27976
mysql-test/r/repair.result:
Auto merged
myisam/sort.c:
Manual merge.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/repair.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result index 54d53299743..f3b515b013a 100644 --- a/mysql-test/r/repair.result +++ b/mysql-test/r/repair.result @@ -84,7 +84,7 @@ Error 1034 Number of rows changed from 0 to 157 SET myisam_repair_threads=2; REPAIR TABLE t1; Table Op Msg_type Msg_text -test.t1 repair error sort_buffer_size is to small +test.t1 repair error myisam_sort_buffer_size is too small test.t1 repair warning Number of rows changed from 0 to 157 test.t1 repair status OK SET myisam_repair_threads=@@global.myisam_repair_threads; |