Manual merge from mysql-trunk.

Browse Source

Conflicts:
  - client/mysqltest.cc
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/t/disabled.def
  - sql/mysqld.cc
  - sql/opt_range.cc
  - sql/sp.cc
  - sql/sql_acl.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc

...

This commit is contained in:

Alexander Nozdrin

2009-12-11 12:39:38 +03:00

parent 713ed2d243 2757eab544

commit 69cfd5c8ec

1063 changed files with 62539 additions and 35389 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

577

sql/sql_parse.cc

File diff suppressed because it is too large Load Diff