diff options
author | Alfranio Correia <alfranio.correia@sun.com> | 2008-12-13 19:42:12 +0000 |
---|---|---|
committer | Alfranio Correia <alfranio.correia@sun.com> | 2008-12-13 19:42:12 +0000 |
commit | 19f859a27e60270f3cdc7e2edc34e88c29536c21 (patch) | |
tree | 3ca8c469534126c025304d8d96dbeb2b359a6c00 /mysql-test/r/general_log_func.result | |
parent | 5c16a315ca28c18949e27b91cddf0886329d1dd4 (diff) | |
parent | ba816c14a9bc8012759da9d58f858f1e73bec708 (diff) | |
download | mariadb-git-19f859a27e60270f3cdc7e2edc34e88c29536c21.tar.gz |
merge 5.1 --> 5.1-rpl
Diffstat (limited to 'mysql-test/r/general_log_func.result')
-rw-r--r-- | mysql-test/r/general_log_func.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/general_log_func.result b/mysql-test/r/general_log_func.result index 4b6cbda6eff..39ba90265d5 100644 --- a/mysql-test/r/general_log_func.result +++ b/mysql-test/r/general_log_func.result @@ -26,7 +26,7 @@ SELECT @@general_log; INSERT into t1(name) values('Record_3'); INSERT into t1(name) values('Record_4'); ## There should be a difference ## -SET @@session.max_allowed_packet= 1024*1024*1024; +SET @@global.max_allowed_packet= 1024*1024*1024; SET @orig_file= load_file('MYSQLD_LOGFILE.orig'); SET @copy_file= load_file('MYSQLD_LOGFILE.copy'); SELECT STRCMP(@orig_file, @copy_file); |