Manual merge from mysql-trunk-merge.

Browse Source

Conflicts:
  - extra/comp_err.c
  - mysql-test/collections/default.experimental
  - mysql-test/r/archive.result
  - mysql-test/r/select.result
  - mysql-test/suite/binlog/r/binlog_unsafe.result
  - mysql-test/suite/binlog/t/binlog_unsafe.test
  - mysql-test/suite/rpl/t/disabled.def
  - mysql-test/t/archive.test
  - mysql-test/t/select.test
  - sql/item.cc
  - sql/item.h
  - sql/item_timefunc.cc
  - sql/sql_base.cc
  - sql/sql_delete.cc
  - sql/sql_load.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc
  - storage/innobase/handler/ha_innodb.cc
  - vio/vio.c

...

This commit is contained in:

Alexander Nozdrin

2009-12-12 23:38:59 +03:00

parent 376cf4275f 5676713687

commit aceea2342f

221 changed files with 5385 additions and 1584 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/bug47012.ARM Normal file

Binary file not shown.

BIN

mysql-test/std_data/bug47012.ARZ Normal file

Binary file not shown.

BIN

mysql-test/std_data/bug47012.frm Normal file

Binary file not shown.