diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-10 16:04:44 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-10 16:04:44 +0200 |
| commit | d019af402cdaa80bd03ad8a5cf2c11cf54443248 (patch) | |
| tree | bcbe5acdb8804a3087639b6d9de70c3d1149cb65 /mysql-test/r/merge_debug.result | |
| parent | d8cbad069acd171c0b9d417fbda74aaf1f3c96a1 (diff) | |
| download | mariadb-git-d019af402cdaa80bd03ad8a5cf2c11cf54443248.tar.gz | |
misc after-merge changes:
* remove new InnoDB-specific ER_ and HA_ERR_ codes
* renamed few old ER_ and HA_ERR_ error messages to be less MyISAM-specific
* remove duplicate enum definitions (durability_properties, icp_result)
* move new mysql-test include files to their owner suite
* rename xtradb.rdiff files to *-disabled
* remove mistakenly committed helper perl module
* remove long obsolete handler::ha_statistic_increment() method
* restore the standard C xid_t structure to not have setters and getters
* remove xid_t::reset that was cleaning too much
* move MySQL-5.7 ER_ codes where they belong
* fir innodb to include service_wsrep.h not internal wsrep headers
* update tests and results
Diffstat (limited to 'mysql-test/r/merge_debug.result')
| -rw-r--r-- | mysql-test/r/merge_debug.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/merge_debug.result b/mysql-test/r/merge_debug.result index d6ca17f0659..51905e52d24 100644 --- a/mysql-test/r/merge_debug.result +++ b/mysql-test/r/merge_debug.result @@ -1,6 +1,7 @@ set @default_storage_engine= @@global.storage_engine; set global storage_engine=myisam; set session storage_engine=myisam; +call mtr.add_suppression("Index for table .*crashed' is corrupt; try to repair it"); drop table if exists crashed,t2,t3,t4; SET @orig_debug=@@debug; CREATE TABLE crashed (c1 INT); |