database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-18 23:03:28 +03:00
Code Activity

Merge: mwl#24+mwl#21 5.1->5.2

Browse Source
This commit is contained in:
Igor Babaev
2010-12-24 08:17:43 -08:00
parent 6c958d6e80 6f2db629a0
commit 7d68e1ead7
37 changed files with 14565 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb_plugin/r/innodb_mysql.result
View File

@ -679,8 +679,6 @@ INSERT INTO t1(b,c) SELECT b,c FROM t2;
UPDATE t2 SET c='2007-01-03';
INSERT INTO t1(b,c) SELECT b,c FROM t2;
set @@sort_buffer_size=8192;
Warnings:
Warning 1292 Truncated incorrect sort_buffer_size value: '8192'
SELECT COUNT(*) FROM t1;
COUNT(*)
3072