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/include/not_crashrep.inc | |
| 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/include/not_crashrep.inc')
| -rw-r--r-- | mysql-test/include/not_crashrep.inc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/include/not_crashrep.inc b/mysql-test/include/not_crashrep.inc index e126f339a5f..7e0d6c19b85 100644 --- a/mysql-test/include/not_crashrep.inc +++ b/mysql-test/include/not_crashrep.inc @@ -22,3 +22,9 @@ EOF if ($crashrep) { --skip CrashReporter would popup a window } + +# the test will crash mysqld. flush tables now to make sure that +# system tables aren't corrupted by the crash +--disable_query_log ONCE +FLUSH TABLES; + |