unknown
2eecc377a6
Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc
merged manually by guilhem.
client/mysqlbinlog.cc:
Post-merge fixes; manually merged by guilhem.
include/mysqld_error.h:
Post-merge fixes.
mysql-test/r/drop_temp_table.result:
Post-merge fixes.
mysql-test/r/insert.result:
Post-merge fixes.
mysql-test/r/mysqlbinlog.result:
Post-merge fixes.
mysql-test/r/query_cache.result:
Post-merge fixes.
mysql-test/r/rpl_error_ignored_table.result:
Post-merge fixes.
mysql-test/r/rpl_relayrotate.result:
Post-merge fixes.
mysql-test/r/rpl_trunc_binlog.result:
Post-merge fixes.
mysql-test/r/sp-error.result:
Post-merge fixes.
mysql-test/r/sp.result:
Post-merge fixes.
mysql-test/r/system_mysql_db.result:
Post-merge fixes.
mysql-test/r/variables.result:
Post-merge fixes.
mysql-test/t/rpl_error_ignored_table.test:
Post-merge fixes.
mysql-test/t/sp-error.test:
Post-merge fixes.
sql/ha_innodb.cc:
Post-merge fixes.
sql/log_event.cc:
Post-merge fixes; manually merged by guilhem.
sql/set_var.cc:
Post-merge fixes.
sql/share/danish/errmsg.txt:
Post-merge fixes.
sql/share/dutch/errmsg.txt:
Post-merge fixes.
sql/share/english/errmsg.txt:
Post-merge fixes.
sql/share/estonian/errmsg.txt:
Post-merge fixes.
sql/sp.cc:
Post-merge fixes.
sql/sql_insert.cc:
Post-merge fixes.
sql/sql_table.cc:
Post-merge fixes.
2004-04-28 12:08:54 +02:00
..
2003-12-10 04:31:42 +00:00
2004-03-30 22:18:49 +05:00
2003-06-04 18:28:51 +03:00
2003-10-08 18:53:31 +03:00
2004-03-25 17:42:13 +01:00
2003-03-17 15:05:04 +02:00
2003-12-10 04:31:42 +00:00
2003-12-10 04:31:42 +00:00
2002-09-03 15:44:25 +03:00
2004-03-30 02:32:41 +03:00
2003-12-10 04:31:42 +00:00
2004-02-16 10:03:25 +02:00
2003-10-30 12:57:26 +02:00
2001-06-25 11:35:22 +03:00
2004-02-24 12:31:33 +01:00
2004-03-29 17:27:30 +05:00
2003-10-31 13:02:16 +04:00
2001-09-27 23:05:54 -06:00
2003-12-10 04:31:42 +00:00
2004-03-26 16:11:46 +04:00
2003-08-22 04:07:40 +03:00
2002-03-13 17:20:17 +00:00
2003-06-04 18:28:51 +03:00
2004-03-26 18:14:39 +04:00
2003-09-24 11:29:38 +02:00
2003-12-10 04:31:42 +00:00
2001-10-08 07:24:04 +03:00
2003-11-21 01:53:01 +02:00
2003-02-10 12:01:47 +01:00
2004-04-02 10:12:53 +04:00
2003-12-24 16:59:48 +04:00
2004-03-30 21:33:45 +05:00
2004-03-29 17:27:30 +05:00
2004-03-30 22:38:52 +05:00
2004-02-04 12:49:54 +04:00
2004-02-11 16:53:39 +04:00
2004-02-16 10:03:25 +02:00
2004-01-15 16:10:44 +04:00
2004-03-25 14:29:56 +04:00
2004-03-29 16:38:38 +05:00
2004-02-04 18:16:28 +04:00
2004-03-25 16:15:52 +04:00
2004-03-26 18:14:39 +04:00
2004-03-26 16:11:46 +04:00
2003-06-04 18:28:51 +03:00
2004-02-16 10:03:25 +02:00
2004-03-20 12:48:14 +02:00
2002-02-13 22:37:19 +02:00
2003-12-16 16:12:28 +01:00
2004-04-28 12:08:54 +02:00
2004-03-19 16:43:03 +01:00
2001-09-27 23:05:54 -06:00
2004-03-25 15:05:01 +02:00
2003-06-04 19:21:51 +03:00
2003-06-04 18:28:51 +03:00
2003-07-03 11:55:36 +03:00
2001-09-27 23:05:54 -06:00
2003-12-10 04:31:42 +00:00
2001-11-06 16:17:31 +01:00
2003-12-10 04:31:42 +00:00
2003-12-10 04:31:42 +00:00
2003-09-29 12:31:35 +03:00
2003-09-29 12:31:35 +03:00
2001-09-27 23:05:54 -06:00
2004-03-07 20:19:37 -06:00
2004-03-16 22:41:30 +02:00
2004-02-28 23:36:41 +01:00
2002-05-21 20:35:58 +03:00
2003-11-07 09:43:24 +02:00
2003-12-10 04:31:42 +00:00
2003-10-31 11:52:46 +02:00
2003-11-07 09:43:24 +02:00
2003-01-06 01:48:59 +02:00
2004-04-07 04:33:58 +03:00
2004-02-16 10:03:25 +02:00
2004-03-17 10:36:12 +02:00
2003-10-31 11:52:01 +02:00
2002-05-16 23:35:09 +03:00
2004-03-11 18:21:57 +04:00
2004-03-19 18:35:49 +02:00
2004-03-16 16:35:53 +01:00
2003-12-17 17:35:34 +02:00
2003-10-30 12:57:26 +02:00
2004-04-07 19:07:44 +02:00
2003-12-16 02:23:40 +02:00
2004-03-19 12:09:14 +04:00
2004-02-11 16:53:39 +04:00
2004-02-20 17:43:02 +02:00
2004-04-07 19:07:44 +02:00
2001-09-27 23:05:54 -06:00
2003-01-06 01:48:59 +02:00
2004-02-19 17:22:38 +04:00
2004-03-17 14:03:26 +04:00
2004-04-05 17:55:26 +05:00
2004-04-05 17:55:26 +05:00
2004-03-17 16:19:09 +04:00
2003-12-19 16:25:50 +02:00
2004-02-11 00:06:46 +01:00
2000-12-27 03:31:06 +02:00
2003-12-24 16:59:48 +04:00
2003-04-09 20:50:30 -04:00
2003-01-28 08:38:28 +02:00
2001-04-13 12:25:12 +03:00
2000-12-27 03:31:06 +02:00
2003-12-14 21:31:02 +01:00
2003-03-11 13:41:53 +04:00
2001-10-04 15:42:25 -06:00
2002-03-22 22:55:08 +02:00
2000-12-28 03:56:38 +02:00
2004-03-25 14:29:56 +04:00
2001-06-05 03:38:10 +03:00
2003-12-25 20:11:01 +04:00
2003-06-02 17:19:06 +05:00
2003-09-19 15:18:19 +05:00
2003-10-30 12:57:26 +02:00
2003-12-10 04:31:42 +00:00
2004-03-31 03:32:38 +03:00
2003-12-10 04:31:42 +00:00
2003-12-10 04:31:42 +00:00
2003-12-10 04:31:42 +00:00
2003-12-18 21:07:19 +03:00
2003-12-18 21:07:19 +03:00
2003-12-18 17:01:35 +03:00
2004-03-15 23:11:58 +03:00
2003-12-21 19:39:32 +02:00
2003-12-10 04:31:42 +00:00
2003-12-10 04:31:42 +00:00
2003-12-10 04:31:42 +00:00
2004-03-31 14:29:01 +05:00
2004-04-07 19:07:44 +02:00
2004-03-15 21:36:16 +04:00
2004-04-28 12:08:54 +02:00
2003-12-10 04:31:42 +00:00
2003-12-10 04:31:42 +00:00
2004-03-19 12:36:55 +04:00
2004-03-19 12:36:55 +04:00
2004-02-02 00:19:51 -08:00
2003-08-11 22:44:43 +03:00
2002-12-14 17:43:01 +02:00
2004-02-20 20:38:34 +01:00
2003-12-08 14:41:41 +04:00
2001-09-27 23:05:54 -06:00
2003-12-11 06:24:08 +02:00
2004-02-28 23:36:41 +01:00
2003-06-04 18:28:51 +03:00
2003-12-10 04:31:42 +00:00
2004-02-16 10:03:25 +02:00
2004-03-06 10:43:35 +02:00
2003-12-30 13:14:21 +02:00
2004-04-06 12:13:43 +03:00
2004-03-10 13:46:11 +02:00
2004-02-20 22:44:54 +02:00
2004-03-22 15:43:13 +02:00
2004-03-04 14:47:33 +01:00
2004-04-06 19:57:33 +05:00
2003-12-20 00:38:30 +01:00
2003-12-16 06:09:44 +02:00
2004-04-07 19:07:44 +02:00
2004-02-17 01:35:17 +02:00
2004-03-30 02:32:41 +03:00
2004-04-28 12:08:54 +02:00
2004-03-14 17:25:20 +01:00
2004-02-22 08:09:32 +02:00
2001-10-08 04:58:07 +03:00
2004-02-16 10:03:25 +02:00
2004-02-16 10:03:25 +02:00
2003-01-06 01:48:59 +02:00
2003-10-30 12:57:26 +02:00
2003-09-14 18:07:14 +04:00
2003-07-16 23:47:48 -05:00
2004-03-30 02:32:41 +03:00
2001-09-27 23:05:54 -06:00
2001-10-08 20:18:37 -06:00
2003-08-29 13:44:35 +03:00
2004-02-02 00:19:51 -08:00
2003-08-22 04:07:40 +03:00
2004-04-28 12:08:54 +02:00
2004-02-17 14:20:04 +02:00
2004-03-26 16:11:46 +04:00
2004-04-01 22:47:09 +05:00
2004-03-22 21:34:36 +04:00
2003-07-16 14:37:00 -05:00
2003-12-10 04:31:42 +00:00
2003-12-10 04:31:42 +00:00
2003-10-30 12:57:26 +02:00
2000-12-27 03:31:06 +02:00
2000-12-27 03:31:06 +02:00
2003-10-30 12:57:26 +02:00
2004-02-17 01:35:17 +02:00
2001-01-03 02:15:48 +02:00
2000-12-27 03:31:06 +02:00
2003-02-17 05:43:37 +02:00
2003-01-06 01:48:59 +02:00
2003-12-10 04:31:42 +00:00
2003-01-06 01:48:59 +02:00
2004-03-20 12:48:14 +02:00
2003-01-06 01:48:59 +02:00
2003-01-06 01:48:59 +02:00
2003-01-06 01:48:59 +02:00
2003-01-06 01:48:59 +02:00
2003-12-19 22:40:23 +01:00
2002-10-24 17:46:14 -06:00
2003-08-11 22:44:43 +03:00
2003-10-08 12:01:58 +03:00
2003-10-29 14:23:35 +01:00
2003-12-19 22:40:23 +01:00
2003-08-19 00:08:08 +03:00
2003-12-19 16:25:50 +02:00
2003-11-20 13:07:25 -06:00
2004-04-28 12:08:54 +02:00
2003-01-03 00:04:33 +02:00
2003-12-19 22:40:23 +01:00
2003-12-19 22:40:23 +01:00
2003-10-30 12:57:26 +02:00
2004-01-30 00:05:34 +01:00
2003-08-19 00:08:08 +03:00
2003-12-08 12:10:30 +04:00
2004-02-11 00:06:46 +01:00
2003-12-19 22:40:23 +01:00
2003-12-19 22:40:23 +01:00
2003-12-19 22:40:23 +01:00
2003-03-17 15:05:04 +02:00
2003-12-19 22:40:23 +01:00
2004-02-17 01:35:17 +02:00
2003-10-30 12:57:26 +02:00
2003-12-19 22:40:23 +01:00
2003-05-13 22:50:28 +02:00
2004-02-16 10:03:25 +02:00
2003-12-19 16:25:50 +02:00
2002-10-24 17:46:14 -06:00
2003-11-20 13:07:25 -06:00
2004-03-18 00:09:13 +02:00
2003-11-20 13:07:25 -06:00
2004-04-28 12:08:54 +02:00
2003-08-11 22:44:43 +03:00
2003-12-19 22:40:23 +01:00
2003-12-19 22:40:23 +01:00
2003-12-19 23:05:07 +01:00
2003-12-19 22:40:23 +01:00
2003-01-06 01:48:59 +02:00
2002-10-24 17:46:14 -06:00
2004-04-07 19:07:44 +02:00
2004-04-28 12:08:54 +02:00
2004-04-07 19:07:44 +02:00
2003-12-19 22:40:23 +01:00
2004-02-16 10:15:52 +02:00
2003-10-08 12:01:58 +03:00
2004-03-19 12:36:55 +04:00
2004-04-07 19:07:44 +02:00
2001-09-27 23:05:54 -06:00
2001-09-27 23:05:54 -06:00
2004-04-28 12:08:54 +02:00
2004-03-22 14:44:41 +01:00
2004-04-28 12:08:54 +02:00
2004-02-09 12:31:03 +01:00
2004-01-27 17:57:19 +01:00
2004-03-21 16:39:14 +02:00
2004-02-16 10:03:25 +02:00
2004-04-07 19:07:44 +02:00
2003-12-19 19:04:03 +03:00
2004-02-17 02:26:35 +02:00
2004-04-06 19:17:13 +05:00
2004-03-19 15:03:12 +02:00
2004-04-28 12:08:54 +02:00
2001-10-08 07:24:04 +03:00
2003-12-10 04:31:42 +00:00
2004-01-30 19:15:11 +03:00
2004-03-06 10:43:35 +02:00
2003-12-17 17:35:34 +02:00
2004-03-26 16:11:46 +04:00
2003-08-11 22:44:43 +03:00
2004-02-16 10:03:25 +02:00
2004-02-16 10:03:25 +02:00
2004-02-16 10:03:25 +02:00
2004-02-16 10:03:25 +02:00
2003-12-10 04:31:42 +00:00
2004-04-02 10:12:53 +04:00
2003-12-10 04:31:42 +00:00
2004-03-15 18:28:21 +04:00
2004-04-02 10:12:53 +04:00
2004-02-16 10:03:25 +02:00
2004-02-16 10:03:25 +02:00
2004-04-07 19:07:44 +02:00
2004-01-20 19:16:18 +02:00
2003-12-31 19:01:03 +04:00
2003-10-30 12:57:26 +02:00
2004-04-28 12:08:54 +02:00
2004-02-28 23:36:41 +01:00