diff options
author | gluh@eagle.(none) <> | 2007-12-13 15:56:04 +0400 |
---|---|---|
committer | gluh@eagle.(none) <> | 2007-12-13 15:56:04 +0400 |
commit | 4f5868114a1fe46f139f80d894dd28f1f7c180c1 (patch) | |
tree | e37ba43ba6ed4171e2b64ad9dbba79328c95a875 /mysql-test/r/innodb_mysql.result | |
parent | 8506efa91e2bccbd312411a949960ec8736a363f (diff) | |
parent | d3889cac7ca8a2188abfd2bcdbe928cee9fd893b (diff) | |
download | mariadb-git-4f5868114a1fe46f139f80d894dd28f1f7c180c1.tar.gz |
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
Diffstat (limited to 'mysql-test/r/innodb_mysql.result')
-rw-r--r-- | mysql-test/r/innodb_mysql.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index a4e09887cac..469c030596b 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -677,6 +677,8 @@ 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 |