1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-31 08:42:45 +03:00
Alexander Nozdrin a6667f8577 Manual merge from mysql-trunk-merge.
Conflicts:
  - configure.in
  - include/m_string.h
  - mysql-test/extra/rpl_tests/rpl_row_func003.test
  - mysql-test/r/mysqlbinlog.result
  - mysql-test/r/union.result
  - mysql-test/suite/binlog/r/binlog_killed_simulate.result
  - mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
  - mysql-test/suite/binlog/r/binlog_unsafe.result
  - mysql-test/suite/binlog/t/binlog_unsafe.test
  - mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
  - mysql-test/suite/rpl/r/rpl_loaddata_map.result
  - mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
  - mysql-test/suite/rpl/r/rpl_stm_log.result
  - mysql-test/suite/rpl/t/rpl_optimize.test
  - mysql-test/t/mysqlbinlog.test
  - mysql-test/t/union.test
  - sql/rpl_utility.h
  - sql/sql_union.cc
  - strings/Makefile.am
2010-01-19 19:36:14 +03:00
..
2010-01-12 20:07:09 +08:00
2009-08-20 14:30:59 +02:00
2010-01-11 18:47:27 -07:00
2009-02-09 22:00:15 +01:00
2009-09-29 17:38:40 +02:00
2009-12-11 12:39:38 +03:00
2009-12-21 14:40:08 +03:00
2009-11-20 22:51:12 +03:00
2009-09-10 03:18:29 -06:00
2009-03-27 10:18:06 +08:00
2009-10-23 23:37:57 +05:00
2009-10-19 14:58:13 +02:00
2009-11-20 22:51:12 +03:00
2009-01-16 17:38:38 +02:00
2009-05-06 15:00:14 +05:30
2009-11-20 22:51:12 +03:00
2009-09-04 15:20:58 +02:00
2009-10-30 10:03:18 +02:00
2009-10-20 11:00:07 -07:00
2009-11-11 21:30:51 +04:00
2009-11-20 22:51:12 +03:00
2009-10-13 23:04:58 +04:00
2009-02-09 22:00:15 +01: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
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
2009-11-02 21:05:42 +01:00
2009-11-20 22:51:12 +03:00
2010-01-13 12:28:42 +02: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-01-15 10:51:39 +02:00
2009-09-29 14:16:23 +03:00
2009-07-03 10:19:32 +02:00
2009-11-27 18:10:28 +02:00
2010-01-19 19:36:14 +03:00
2009-11-20 23:30:00 +03:00
2009-02-19 18:24:25 -05:00
2009-10-08 16:36:36 +01:00