merge mysql-next-mr --> mysql-5.1-rpl-merge

Browse Source

Conflicts:
  Text conflict in sql/log.cc
  Text conflict in sql/slave.cc
  Text conflict in sql/sql_base.cc

...

This commit is contained in:

Alfranio Correia

2010-01-13 12:22:34 +00:00

parent 231773b449 357496c091

commit 46d1689b7c

166 changed files with 5710 additions and 2415 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

1042

sql/mysqld.cc

File diff suppressed because it is too large Load Diff