database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql-5.5-bugteam --> local bugfixing branch

Browse Source
This commit is contained in:
Marc Alff
2010-11-08 18:14:30 +01:00
parent 62e43d42ca 42e133e74e
commit 4ee5c36845
123 changed files with 1666 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/r/tampered_perfschema_table1.result
View File

@ -2,5 +2,5 @@ call mtr.add_suppression(
"Column count of mysql.setup_instruments is wrong. "
"Expected 4, found 3. The table is probably corrupted");
select * from performance_schema.setup_instruments limit 1;
ERROR HY000: Native table 'performance_schema'.'SETUP_INSTRUMENTS' has the wrong structure
ERROR HY000: Native table 'performance_schema'.'setup_instruments' has the wrong structure
select * from performance_schema.setup_consumers limit 1;