database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source 
Conflicts:

Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/having.result
Text conflict in mysql-test/suite/rpl/t/disabled.def
Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test
Text conflict in storage/federated/ha_federated.cc
This commit is contained in:
Alexey Kopytov
2010-03-07 19:40:59 +03:00
parent 61bd9ef648 63a88e1373
commit 6e7b8b6a7a
39 changed files with 645 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mysql-test/std_data/bug49823.CSM Normal file
View File

Binary file not shown.

1
mysql-test/std_data/bug49823.CSV Normal file
View File

@ -0,0 +1 @@
"2010-02-26 13:32:26","root[root] @ localhost []",2,1,"Query","SELECT 1"
1 2010-02-26 13:32:26 root[root] @ localhost [] 2 1 Query SELECT 1

BIN
mysql-test/std_data/bug49823.frm Normal file
View File

Binary file not shown.