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

second merge from main, with adaptions

Browse Source
This commit is contained in:
Bjorn Munch
2009-09-02 23:29:11 +02:00
parent a829604260 41427950ed
commit 31f9d5fd16
145 changed files with 6274 additions and 1070 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/mtr_warnings.sql
View File

@ -162,6 +162,8 @@ INSERT INTO global_suppressions VALUES
("Slave: Unknown column 'c7' in 't15' Error_code: 1054"),
("Slave: Can't DROP 'c7'.* 1091"),
("Slave: Key column 'c6'.* 1072"),
("Slave I/O: The slave I/O thread stops because a fatal error is encountered when it try to get the value of SERVER_ID variable from master."),
(".SELECT UNIX_TIMESTAMP... failed on master, do not trust column Seconds_Behind_Master of SHOW SLAVE STATUS"),
/* Test case for Bug#31590 in order_by.test produces the following error */
("Out of sort memory; increase server sort buffer size"),