diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-05-04 23:30:29 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-05-04 23:30:29 -0400 |
| commit | 5cefab7809803d0033825de2e11362dc77016130 (patch) | |
| tree | 779fcb0cc438657e7955e286dcd1bec9b5389b58 /mysql-test/r/repair.result | |
| parent | 424413f20be8b1e16bf4bf9ddfd639a2080cba19 (diff) | |
| parent | 2b7cad650329bff5021a1083696d06dee30f1b26 (diff) | |
| download | mariadb-git-5cefab7809803d0033825de2e11362dc77016130.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my50-bug27976
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my51-bug27976
mysql-test/r/repair.result:
Auto merged
storage/myisam/sort.c:
Auto merged
Diffstat (limited to 'mysql-test/r/repair.result')
| -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 1269c4c85a9..2c194ac8bbc 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; |