database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.

Browse Source 
Conflicts:

   conflict      Makefile.am
   conflict      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
   conflict      mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
   conflict      sql/opt_sum.cc
   conflict      sql/set_var.cc
   conflict      sql/sql_base.cc
   conflict      sql/sql_priv.h
   conflict      sql/sql_show.cc
This commit is contained in:
Alexey Kopytov
2010-05-24 00:41:18 +04:00
parent eff442964a 6e34b8b0ce
commit b69a31fad5
38 changed files with 784 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/variables_debug.result
View File

@ -1,3 +1,4 @@
SET @old_debug = @@GLOBAL.debug;
set debug= 'T';
select @@debug;
@@debug
@ -29,4 +30,5 @@ SET GLOBAL debug='';
SELECT @@global.debug;
@@global.debug
SET GLOBAL debug=@old_debug;
End of 5.1 tests