1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-28 13:01:41 +03:00
Alexey Kopytov d95c1e3b47 Manual merge of mysql-trunk into mysql-trunk-merge.
Conflicts:

Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/Makefile.am
Text conflict in mysql-test/collections/default.daily
Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result
Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test
Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test
Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test
Text conflict in mysys/charset.c
Text conflict in sql/field.cc
Text conflict in sql/field.h
Text conflict in sql/item.h
Text conflict in sql/item_func.cc
Text conflict in sql/log.cc
Text conflict in sql/log_event.cc
Text conflict in sql/log_event_old.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/rpl_utility.cc
Text conflict in sql/rpl_utility.h
Text conflict in sql/set_var.cc
Text conflict in sql/share/Makefile.am
Text conflict in sql/sql_delete.cc
Text conflict in sql/sql_plugin.cc
Text conflict in sql/sql_select.cc
Text conflict in sql/sql_table.cc
Text conflict in storage/example/ha_example.h
Text conflict in storage/federated/ha_federated.cc
Text conflict in storage/myisammrg/ha_myisammrg.cc
Text conflict in storage/myisammrg/myrg_open.c
2010-03-24 18:03:44 +03:00
..
2009-08-20 14:30:59 +02:00
2010-02-25 23:13:11 +04:00
2010-01-11 18:47:27 -07:00
2010-02-06 13:28:06 +03:00
2010-02-24 16:52:27 +03:00
2010-02-24 13:15:34 +04:00
2010-02-24 13:15:34 +04:00
2010-02-24 13:15:34 +04:00
2010-02-24 13:15:34 +04:00
2010-02-24 13:15:34 +04:00
2010-02-02 02:22:16 +03:00
2009-12-08 10:53:40 +03:00
2009-12-09 18:56:34 +03:00
2010-03-10 12:22:08 +02:00
2010-02-11 18:32:53 +01:00
2009-10-19 14:58:13 +02:00
2009-05-06 15:00:14 +05:30
2010-01-15 15:42:15 +04:00
2010-01-15 15:42:15 +04:00
2010-02-26 13:02:57 +04:00
2010-02-02 02:22:16 +03:00
2009-12-03 23:08:27 +03:00
2009-09-04 15:20:58 +02:00
2009-11-30 19:09:42 +03:00
2010-02-11 19:10:34 +03:00
2009-12-03 02:09:22 +03:00
2009-12-24 10:56:13 +03:00
2010-01-12 20:07:09 +08:00
2009-11-17 17:08:37 +01:00
2010-01-29 16:54:27 +02:00
2009-12-10 17:38:01 +02:00
2009-10-19 14:58:13 +02:00
2009-09-04 15:20:58 +02:00
2009-08-12 12:03:05 +02:00
2010-02-02 12:22:17 +03:00
2010-02-24 00:22:19 -07:00
2009-11-02 21:05:42 +01:00
2009-12-29 15:19:05 +03:00
2010-02-06 13:28:06 +03:00
2010-02-06 13:28:06 +03:00
2009-12-03 23:08:27 +03:00
2009-11-20 22:51:12 +03:00
2009-09-10 03:18:29 -06:00
2009-09-10 03:18:29 -06:00
2009-09-10 03:18:29 -06:00
2009-09-10 03:18:29 -06:00
2009-09-10 03:18:29 -06:00
2009-09-10 03:18:29 -06:00
2010-02-06 13:28:06 +03:00
2009-09-29 14:16:23 +03:00
2009-12-29 15:19:05 +03:00
2009-07-03 10:19:32 +02:00
2009-11-27 18:10:28 +02:00
2010-03-18 13:38:29 +03:00
2009-12-03 23:08:27 +03:00
2009-02-19 18:24:25 -05:00
2009-12-11 15:24:23 +03:00
2010-02-20 12:40:21 +03:00
2010-02-24 16:52:27 +03:00