diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-02 01:48:43 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-02 01:48:43 +0100 |
| commit | 6a72267d05ba24953345b9fe516d6bff2f77e8eb (patch) | |
| tree | 2cc4962b85af835d461cb0c5c5759ff69ea5b687 /mysql-test/r/innodb_mysql.result | |
| parent | e26804399bf57d20f9bd37aebd143ca225daf3f0 (diff) | |
| parent | 89a208850a714d5653207cffa2d654e86063a7e7 (diff) | |
| download | mariadb-git-6a72267d05ba24953345b9fe516d6bff2f77e8eb.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31177/50-31177
client/mysql.cc:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysqld.cc:
Auto merged
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 d5f014b6840..b073e4bd6ce 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -712,6 +712,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 |