diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-28 01:04:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-28 01:04:46 +0200 |
| commit | 20e706689df1eb87c696304797e9d6184c0a75bb (patch) | |
| tree | ff3eab8fa3e060b34687c6e9819cb559ac67d5c5 /mysql-test/r/myisam.result | |
| parent | 3d0775e9af2fcf3fe92b7f19e299ea23068eca1e (diff) | |
| parent | bfaebe3f5e4b917c4498e234bad7a9d45d07ca62 (diff) | |
| download | mariadb-git-20e706689df1eb87c696304797e9d6184c0a75bb.tar.gz | |
mysql-5.5.22 merge
mysql-test/suite/innodb/t/group_commit_crash.test:
remove autoincrement to avoid rbr being used for insert ... select
mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test:
remove autoincrement to avoid rbr being used for insert ... select
mysys/my_addr_resolve.c:
a pointer to a buffer is returned to the caller -> the buffer cannot be on the stack
mysys/stacktrace.c:
my_vsnprintf() is ok here, in 5.5
Diffstat (limited to 'mysql-test/r/myisam.result')
| -rw-r--r-- | mysql-test/r/myisam.result | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 2a2197e7f98..64c61d4ee36 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -2494,6 +2494,19 @@ Table Op Msg_type Msg_text test.t1 check status OK DROP TABLE t1; SET GLOBAL myisam_use_mmap=default; +# +# BUG 11756869 - 48848: MYISAMCHK DOING SORT RECOVER IN CERTAIN +# CASES RESETS DATA POINTER TO SMAL +# +CREATE TABLE t1(a INT, KEY(a)); +ALTER TABLE t1 DISABLE KEYS; +SET @before:= (SELECT MAX_DATA_LENGTH FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test'); +FLUSH TABLES; +SET @after:= (SELECT MAX_DATA_LENGTH FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test'); +SELECT @before=@after; +@before=@after +1 +DROP TABLE t1; End of 5.1 tests # # Bug#51327 MyISAM table is automatically repaired on ALTER |