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

Browse Source

Conflicts:

Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/subselect.result
Text conflict in mysql-test/r/subselect3.result
Text conflict in mysql-test/r/type_datetime.result
Text conflict in sql/share/Makefile.am

...

This commit is contained in:

Alexey Kopytov

2010-03-12 12:51:53 +03:00

parent d2452095a5 cbfdc588e9

commit 4db97ede5b

50 changed files with 1221 additions and 420 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

mysql-test/std_data/bug48265.frm Normal file

Binary file not shown.