diff options
author | Michael Widenius <monty@askmonty.org> | 2012-02-20 16:23:18 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2012-02-20 16:23:18 +0200 |
commit | ae07ec6cbf08e311e538f5149f93385e5bcaa7a6 (patch) | |
tree | 4f2dee1467f3c3e3bd8feb6ffb7adf7684bdc653 /mysql-test/r/mysqlcheck.result | |
parent | 0c568a99dfe3e528ec5bd09dfe0f2f90acb52db4 (diff) | |
parent | dacaaf22a3f132df5573fe8e58c0617c30c5e9fc (diff) | |
download | mariadb-git-ae07ec6cbf08e311e538f5149f93385e5bcaa7a6.tar.gz |
Merge with MYSQL 5.1.61
Fixed README with link to source
Merged InnoDB change to XtraDB
README:
Added information of where to find MariaDB code
storage/archive/ha_archive.cc:
Removed memset() of rows, a MariaDB checksum's doesn't touch not used data.
Diffstat (limited to 'mysql-test/r/mysqlcheck.result')
-rw-r--r-- | mysql-test/r/mysqlcheck.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result index 812fd12e197..6ba5078ed00 100644 --- a/mysql-test/r/mysqlcheck.result +++ b/mysql-test/r/mysqlcheck.result @@ -139,6 +139,7 @@ DROP TABLE `@`; CREATE TABLE `я` (a INT); SET NAMES DEFAULT; mysqlcheck --default-character-set="latin1" --databases test +call mtr.add_suppression("Can't find file: '..test.@003f.frm'"); test.? Error : Table doesn't exist status : Operation failed |