10.0-base merge.

Partitioning/InnoDB changes are *not* merged (they'll come from 5.6) TokuDB does not compile (not updated to 10.0 SE API)
2025-07-30 16:24:05 +03:00 · 2013-09-21 10:14:42 +02:00
parent a6add4ff43 2fe0836eed
commit 9af177042e
3463 changed files with 1907099 additions and 85423 deletions
--- a/mysql-test/std_data/mdev-4645-binlog_checksum.binlog
+++ b/mysql-test/std_data/mdev-4645-binlog_checksum.binlog
--- a/mysql-test/std_data/mdev-4645-binlog_group_id.binlog
+++ b/mysql-test/std_data/mdev-4645-binlog_group_id.binlog
--- a/mysql-test/std_data/mdev-4645-binlog_group_id_checksum.binlog
+++ b/mysql-test/std_data/mdev-4645-binlog_group_id_checksum.binlog
--- a/mysql-test/std_data/mdev-4645-binlog_none.binlog
+++ b/mysql-test/std_data/mdev-4645-binlog_none.binlog
--- a/mysql-test/std_data/mdev5029_1.frm
+++ b/mysql-test/std_data/mdev5029_1.frm
--- a/mysql-test/std_data/mdev5029_2.MAD
+++ b/mysql-test/std_data/mdev5029_2.MAD
--- a/mysql-test/std_data/mdev5029_2.MAI
+++ b/mysql-test/std_data/mdev5029_2.MAI
--- a/mysql-test/std_data/mdev5029_2.frm
+++ b/mysql-test/std_data/mdev5029_2.frm
--- a/mysql-test/std_data/pbxt_load_unique_error1.inc
+++ b/mysql-test/std_data/pbxt_load_unique_error1.inc
@ -1,5 +0,0 @@
-1,abc
-2,def
-3,ghi
-3,jkl
-4,opq