Alexander Nozdrin bc2d4e620a Manual merge from mysql-trunk-merge. ... 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		2009-12-12 23:38:59 +03:00
..
r	Manual merge from mysql-trunk-merge.	2009-12-12 23:38:59 +03:00
std_data	Bug#47323 : mysqlbinlog --verbose displays bad output when events contain subset of columns	2009-10-09 16:54:48 +08:00
t	Manual merge from mysql-trunk-merge.	2009-12-12 23:38:59 +03:00
combinations	WL#4350 Options in my.cnf style config file should not start with --	2008-09-05 15:31:09 +02:00