diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-12 23:38:59 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-12 23:38:59 +0300 |
| commit | bc2d4e620ac81824b2e30bf8a1c92e164717b2e1 (patch) | |
| tree | 2a2432e481d124691d9fa4b39d8a192264178bd1 /mysql-test/r/innodb_bug34300.result | |
| parent | bd1f8f5bfaf9748ca445401687cca97a89e0dfee (diff) | |
| parent | 69cfd5c8ecd20bca0e651efcbb8b5affc24c1af4 (diff) | |
| download | mariadb-git-bc2d4e620ac81824b2e30bf8a1c92e164717b2e1.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- extra/comp_err.c
- mysql-test/collections/default.experimental
- mysql-test/r/archive.result
- mysql-test/r/select.result
- mysql-test/suite/binlog/r/binlog_unsafe.result
- mysql-test/suite/binlog/t/binlog_unsafe.test
- mysql-test/suite/rpl/t/disabled.def
- mysql-test/t/archive.test
- mysql-test/t/select.test
- sql/item.cc
- sql/item.h
- sql/item_timefunc.cc
- sql/sql_base.cc
- sql/sql_delete.cc
- sql/sql_load.cc
- sql/sql_partition.cc
- sql/sql_table.cc
- storage/innobase/handler/ha_innodb.cc
- vio/vio.c
Diffstat (limited to 'mysql-test/r/innodb_bug34300.result')
| -rw-r--r-- | mysql-test/r/innodb_bug34300.result | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mysql-test/r/innodb_bug34300.result b/mysql-test/r/innodb_bug34300.result index 4e3d3c17040..ae9fee81ad7 100644 --- a/mysql-test/r/innodb_bug34300.result +++ b/mysql-test/r/innodb_bug34300.result @@ -1,10 +1,4 @@ -SELECT f4, f8 FROM bug34300; f4 f8 xxx zzz -ALTER TABLE bug34300 ADD COLUMN (f10 INT); -SELECT f4, f8 FROM bug34300; f4 f8 xxx zzz -DROP TABLE bug34300; -SET @@global.max_allowed_packet=1048576; -SET @@global.max_allowed_packet=default; |