diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-06-11 14:53:26 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-06-11 14:53:26 +0200 |
| commit | 93bcda598bd6c58a7f5ad3d2e860b194325eed9f (patch) | |
| tree | 014bccd2ba79d230f4f3cb4ff03f89640b99e1e4 /mysql-test/r/mysqlbinlog_row_big.result | |
| parent | d2d7b5bbb6796ee171ef605f5ea61cb782918b72 (diff) | |
| parent | 121461f6f3987c4b058d64775f1380016b68896c (diff) | |
| download | mariadb-git-93bcda598bd6c58a7f5ad3d2e860b194325eed9f.tar.gz | |
Merge latest XtraDB from lp:percona-xtradb into MariaDB.
include/my_sys.h:
Move generic file parsing functions out to shared code, as they are used in several places.
mysys/mf_iocache2.c:
Move generic file parsing functions out to shared code, as they are used in several places.
sql/log_event.cc:
Fix XtraDB build with embedded server.
XtraDB needs access to replication stuff, which is missing in embedded server.
Solved by defining wrapper function for this which is compiled differently for normal and
embedded case.
sql/log_event.h:
Fix XtraDB build with embedded server.
XtraDB needs access to replication stuff, which is missing in embedded server.
Solved by defining wrapper function for this which is compiled differently for normal and
embedded case.
sql/slave.cc:
Move generic file parsing functions out to shared code, as they are used in several places.
Diffstat (limited to 'mysql-test/r/mysqlbinlog_row_big.result')
| -rw-r--r-- | mysql-test/r/mysqlbinlog_row_big.result | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/r/mysqlbinlog_row_big.result b/mysql-test/r/mysqlbinlog_row_big.result index f2ca72f9936..05488be6b08 100644 --- a/mysql-test/r/mysqlbinlog_row_big.result +++ b/mysql-test/r/mysqlbinlog_row_big.result @@ -1,4 +1,9 @@ # +# We need big packets. +# +SET @old_global_max_allowed_packet=@@global.max_allowed_packet; +SET @@global.max_allowed_packet= 1024*1024*1024; +# # Preparatory cleanup. # DROP TABLE IF EXISTS t1; @@ -7,10 +12,6 @@ DROP TABLE IF EXISTS t1; # SET timestamp=1000000000; # -# We need big packets. -# -SET @@global.max_allowed_packet= 1024*1024*1024; -# # Delete all existing binary logs. # RESET MASTER; @@ -71,4 +72,5 @@ FLUSH LOGS; # Cleanup. # DROP TABLE t1; +SET @@global.max_allowed_packet=@old_global_max_allowed_packet; remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_big_1.out |