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

Browse Source

Conflicts:

Text conflict in mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
Text conflict in sql/log.cc
Text conflict in sql/set_var.cc
Text conflict in sql/sql_class.cc

...

This commit is contained in:

Alexey Kopytov

2010-04-03 21:35:51 +04:00

parent 018b0d3ee7 0cb83d46e4

commit 3df8e88dd8

43 changed files with 496 additions and 80 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/binlog_savepoint.000001 Normal file

Binary file not shown.