Alexander Nozdrin aceea2342f 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
..
srv0que.c	Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same	2009-08-07 12:16:00 +02:00
srv0srv.c	Manual merge from mysql-trunk-merge.	2009-12-12 23:38:59 +03:00
srv0start.c	Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mysql-trunk-merge.	2009-12-02 19:30:50 +05:30