Skip to content

M
mariadb
Commit 3a2e673c authored by kaa@polly.(none)'s avatar kaa@polly.(none)
Browse files
Options

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
parents a9184873 63ae0223
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/r/repair.result
View file @ 3a2e673c
...@@ -89,7 +89,7 @@ SET myisam_repair_threads=@@global.myisam_repair_threads; ...@@ -89,7 +89,7 @@ SET myisam_repair_threads=@@global.myisam_repair_threads;
SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size; SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1(a CHAR(255), KEY(a)); CREATE TABLE t1(a CHAR(255), KEY(a));
SET myisam_sort_buffer_size=4196; SET myisam_sort_buffer_size=4496;
INSERT INTO t1 VALUES INSERT INTO t1 VALUES
('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
......
mysql-test/t/repair.test
View file @ 3a2e673c
...@@ -88,7 +88,7 @@ DROP TABLE t1; ...@@ -88,7 +88,7 @@ DROP TABLE t1;
# myisam_sort_buffer_size # myisam_sort_buffer_size
# #
CREATE TABLE t1(a CHAR(255), KEY(a)); CREATE TABLE t1(a CHAR(255), KEY(a));
SET myisam_sort_buffer_size=4196; SET myisam_sort_buffer_size=4496;
INSERT INTO t1 VALUES INSERT INTO t1 VALUES
('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'), ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7