diff options
| author | unknown <kaa@polly.(none)> | 2007-10-17 10:38:26 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-10-17 10:38:26 +0400 |
| commit | d5cf878e52f66b64ba4ffafbab0942546fe3c2e2 (patch) | |
| tree | b9d45097846a0b3fa6230a27881b1e5358ce136c | |
| parent | 6f471bff96553b337a4605d7833eaa61722036dc (diff) | |
| parent | d73ab388b1c55df00b576afaaae271313bff80e2 (diff) | |
| download | mariadb-git-d5cf878e52f66b64ba4ffafbab0942546fe3c2e2.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
mysql-test/r/repair.result:
Auto merged
mysql-test/t/repair.test:
Auto merged
| -rw-r--r-- | mysql-test/r/repair.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/repair.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result index c3af8732e8c..8c0671ad740 100644 --- a/mysql-test/r/repair.result +++ b/mysql-test/r/repair.result @@ -89,7 +89,7 @@ SET myisam_repair_threads=@@global.myisam_repair_threads; SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size; DROP TABLE t1; CREATE TABLE t1(a CHAR(255), KEY(a)); -SET myisam_sort_buffer_size=4196; +SET myisam_sort_buffer_size=4496; INSERT INTO t1 VALUES ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), diff --git a/mysql-test/t/repair.test b/mysql-test/t/repair.test index 59ab905c62e..b433b8720b9 100644 --- a/mysql-test/t/repair.test +++ b/mysql-test/t/repair.test @@ -88,7 +88,7 @@ DROP TABLE t1; # myisam_sort_buffer_size # CREATE TABLE t1(a CHAR(255), KEY(a)); -SET myisam_sort_buffer_size=4196; +SET myisam_sort_buffer_size=4496; INSERT INTO t1 VALUES ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), |