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 from mysql-5.1-bugteam into mysql-5.5-bugteam.

Browse Source 
conflicts:
   conflict      dbug/dbug.c
   conflict      sql/sql_load.cc
This commit is contained in:
Alexey Kopytov
2010-10-02 00:12:27 +04:00
parent 16076e6a6f e1e838169a
commit 49e715258f
8 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,19 @@ SELECT @@global.debug;
@@global.debug
SET GLOBAL debug=@old_debug;
#
# Bug #56709: Memory leaks at running the 5.1 test suite
#
SET @old_local_debug = @@debug;
SET @@debug='d,foo';
SELECT @@debug;
@@debug
d,foo
SET @@debug='';
SELECT @@debug;
@@debug
SET @@debug = @old_local_debug;
End of 5.1 tests
#
# Bug#46165 server crash in dbug