unknown
ae26d2aa5a
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/r/information_schema_db.result:
Auto merged
mysql-test/r/lock_multi.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/lock_multi.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysys/default.c:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
storage/heap/hp_write.c:
Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
Auto merged
client/mysqlbinlog.cc:
Manual merge from 5.0
client/mysqldump.c:
Manual merge from 5.0
configure.in:
Manual merge from 5.0
mysql-test/r/mysqldump.result:
Manual merge from 5.0
mysql-test/t/mysqldump.test:
Manual merge from 5.0
mysql-test/t/rpl_insert_id.test:
Manual merge from 5.0
server-tools/instance-manager/manager.cc:
Manual merge from 5.0
sql/field.cc:
Manual merge from 5.0
sql/ha_ndbcluster.cc:
Manual merge from 5.0
sql/mysqld.cc:
Manual merge from 5.0
sql/sql_base.cc:
Manual merge from 5.0
sql/sql_lex.cc:
Manual merge from 5.0
sql/sql_select.cc:
Manual merge from 5.0
sql/sql_table.cc:
Manual merge from 5.0
2006-05-30 16:07:49 +03:00
..
2006-05-15 19:41:04 +03:00
2006-05-03 16:33:42 +05:00
2006-05-01 21:30:09 +03:00
2006-05-15 12:31:14 -05:00
2006-05-12 18:02:42 +05:00
2006-02-24 18:34:15 +02:00
2006-02-17 11:03:34 -08:00
2006-03-01 15:50:15 +04:00
2006-03-02 20:49:10 -05:00
2006-03-18 17:15:53 +01:00
2006-03-18 17:15:53 +01:00
2006-02-22 10:07:54 +01:00
2006-03-18 17:15:53 +01:00
2006-02-24 16:19:55 +01:00
2006-02-22 10:07:54 +01:00
2006-02-20 10:30:32 +01:00
2006-04-25 20:05:15 +03:00
2006-05-02 09:13:58 -04:00
2006-02-17 12:07:45 +01:00
2006-02-24 18:34:15 +02:00
2006-05-02 17:53:26 -07:00
2006-03-31 13:17:45 +05:00
2006-04-11 12:12:48 +02:00
2006-03-22 00:47:36 +01:00
2006-03-23 14:03:39 +04:00
2006-04-11 18:16:14 +05:00
2006-04-06 10:51:23 +05:00
2006-04-18 18:10:47 +02:00
2006-05-24 00:55:53 +02:00
2006-03-20 14:43:02 +04:00
2006-03-20 14:43:02 +04:00
2006-04-17 15:01:55 +05:00
2006-03-23 14:14:32 +04:00
2006-03-30 17:14:55 +04:00
2006-05-10 21:44:11 +02:00
2006-02-24 18:34:15 +02:00
2006-05-22 21:57:23 +02:00
2006-05-09 18:13:01 +03:00
2006-05-22 20:46:13 +02:00
2006-05-29 13:16:29 +02:00
2006-03-01 16:27:57 +01:00
2006-05-23 17:51:17 -07:00
2006-05-22 20:46:13 +02:00
2006-05-22 20:46:13 +02:00
2006-05-23 12:10:07 +02:00
2006-05-29 10:39:45 +02:00
2006-05-05 20:08:40 +03:00
2006-05-03 18:02:43 +04:00
2006-03-06 23:20:19 +01:00
2006-05-24 17:21:35 +03:00
2006-03-22 16:48:35 +01:00
2006-04-23 12:32:39 +03:00
2006-04-21 00:36:20 -07:00
2006-05-22 16:10:53 +03:00
2006-05-15 14:18:23 +04:00
2006-03-06 12:52:38 +04:00
2006-05-06 19:45:24 +04:00
2006-04-11 15:26:18 +05:00
2006-05-18 10:34:01 -07:00
2006-02-26 15:11:56 +02:00
2006-05-16 03:32:24 +02:00
2006-04-30 13:27:38 -07:00
2006-05-26 11:47:53 +03:00
2006-05-23 16:43:01 +03:00
2006-02-24 18:34:15 +02:00
2006-05-06 23:48:13 -07:00
2006-05-11 21:15:37 +05:00
2006-05-10 21:50:04 +05:00
2006-05-18 18:57:50 +04:00
2006-05-18 18:57:50 +04:00
2006-05-18 18:57:50 +04:00
2006-05-18 18:57:50 +04:00
2006-05-18 18:57:50 +04:00
2006-05-18 18:57:50 +04:00
2006-05-18 18:57:50 +04:00
2006-05-18 18:57:50 +04:00
2006-05-18 18:57:50 +04:00
2006-05-18 18:57:50 +04:00
2006-04-13 16:05:32 +04:00
2006-05-23 10:52:53 +02:00
2006-05-30 10:45:23 +05:00
2006-05-02 16:31:39 +05:00
2006-05-29 15:43:00 +02:00
2006-05-17 18:01:05 +05:00
2006-05-23 16:43:01 +03:00
2006-02-24 18:34:15 +02:00
2006-04-23 12:48:31 +04:00
2006-04-23 12:48:31 +04:00
2006-04-23 12:48:31 +04:00
2006-05-05 20:08:40 +03:00
2006-04-11 23:06:47 +04:00
2006-03-29 16:45:29 -08:00
2006-05-17 20:48:48 -07:00
2006-03-06 11:41:19 +02:00
2006-04-19 18:08:15 -07:00
2006-03-06 23:43:47 +01:00
2006-03-29 10:56:11 -05:00
2006-05-30 16:07:49 +03:00
2006-03-06 21:03:17 +03:00
2006-05-23 09:49:04 -07:00
2006-05-12 08:50:31 -07:00
2006-05-03 15:59:17 +03:00
2006-05-08 16:06:16 -04:00
2006-05-02 15:07:00 -04:00
2006-04-24 13:07:53 +05:00
2006-03-01 15:22:47 +01:00
2006-05-09 22:35:51 -04:00
2006-02-22 10:07:54 +01:00
2006-05-18 18:38:50 +02:00
2006-02-24 13:20:51 -08:00
2006-05-30 16:07:49 +03:00
2006-03-10 08:54:12 -08:00
2006-04-11 15:01:21 +05:00
2006-04-19 12:21:33 +03:00
2006-05-04 18:26:36 +02:00
2006-05-25 12:13:47 +02:00
2006-05-18 23:38:07 +02:00
2006-05-15 10:50:31 +02:00
2006-02-25 22:21:03 +01:00
2006-03-11 06:58:48 +01:00
2006-04-13 15:16:02 +02:00
2006-04-24 23:29:33 +02:00
2006-03-11 15:52:38 +01:00
2006-03-13 09:55:41 +01:00
2006-05-21 11:04:57 +02:00
2006-02-27 10:29:55 +01:00
2006-05-10 21:38:48 +02:00
2006-05-04 19:39:47 +03:00
2006-05-04 19:39:47 +03:00
2006-05-30 01:36:35 +02:00
2006-04-24 18:26:30 +02:00
2006-03-10 14:36:48 +01:00
2006-03-10 14:36:48 +01:00
2006-03-03 11:52:52 +01:00
2006-05-09 12:06:50 +02:00
2006-03-28 10:01:23 +02:00
2006-02-22 10:07:54 +01:00
2006-03-08 14:45:09 +01:00
2006-03-06 18:06:21 +01:00
2006-03-28 14:38:16 +02:00
2006-03-23 09:48:46 +01:00
2006-04-26 01:11:40 +02:00
2006-04-26 01:11:40 +02:00
2006-02-17 17:12:35 +01:00
2006-05-01 09:46:00 -04:00
2006-05-03 14:06:34 +02:00
2006-04-21 00:36:20 -07:00
2006-05-12 10:27:20 +02:00
2006-03-02 12:25:02 +04:00
2006-03-07 12:42:23 -08:00
2006-04-10 10:44:47 -04:00
2006-03-13 14:50:16 +01:00
2006-03-28 10:42:28 +02:00
2006-03-11 06:17:10 -08:00
2006-04-10 13:07:50 -04:00
2006-04-11 23:35:48 -04:00
2006-05-25 19:20:35 +05:00
2006-05-02 18:41:42 -04:00
2006-04-28 11:23:31 +02:00
2006-05-02 18:41:42 -04:00
2006-03-15 19:15:52 +02:00
2006-05-02 09:13:58 -04:00
2006-02-24 18:34:15 +02:00
2006-05-06 09:41:24 +04:00
2006-02-17 12:16:36 +01:00
2006-02-23 23:20:29 -05:00
2006-05-11 11:09:58 +02:00
2006-02-22 10:07:54 +01:00
2006-03-21 17:40:51 +01:00
2006-02-24 16:19:55 +01:00
2006-05-29 14:45:20 +04:00
2006-02-22 10:07:54 +01:00
2006-02-22 10:07:54 +01:00
2006-02-22 10:07:54 +01:00
2006-02-22 10:07:54 +01:00
2006-02-24 16:19:55 +01:00
2006-05-02 22:56:53 +02:00
2006-02-22 10:07:54 +01:00
2006-05-12 14:09:13 +02:00
2006-02-27 15:09:03 +01:00
2006-02-27 15:09:03 +01:00
2006-02-27 15:09:03 +01:00
2006-02-27 15:09:03 +01:00
2006-02-27 15:09:03 +01:00
2006-02-27 15:09:03 +01:00
2006-04-12 15:55:41 +02:00
2006-04-19 14:54:39 +02:00
2006-03-09 17:16:04 +01:00
2006-04-12 15:55:41 +02:00
2006-04-12 15:55:41 +02:00
2006-04-19 11:20:11 +03:00
2006-03-01 13:31:21 +01:00
2006-02-27 15:09:03 +01:00
2006-05-11 11:09:58 +02:00
2006-02-27 15:09:03 +01:00
2006-04-19 11:20:11 +03:00
2006-03-15 16:29:25 +01:00
2006-04-19 11:20:11 +03:00
2006-03-01 13:31:21 +01:00
2006-02-27 15:09:03 +01:00
2006-05-11 11:09:58 +02:00
2006-02-27 15:09:03 +01:00
2006-04-12 15:55:41 +02:00
2006-04-30 13:27:38 -07:00
2006-03-16 17:44:27 +02:00
2006-03-14 14:21:28 +01:00
2006-04-13 20:42:48 +02:00
2006-04-30 13:27:38 -07:00
2006-02-25 22:21:03 +01:00
2006-04-11 15:38:32 +02:00
2006-05-12 14:09:13 +02:00
2006-03-18 17:15:53 +01:00
2006-02-24 16:19:55 +01:00
2006-05-12 14:09:13 +02:00
2006-02-22 10:07:54 +01:00
2006-02-22 22:03:55 +01:00
2006-02-22 23:11:42 +01:00
2006-02-22 10:07:54 +01:00
2006-02-22 10:07:54 +01:00
2006-02-24 16:19:55 +01:00
2006-02-17 20:29:46 +01:00
2006-02-22 10:07:54 +01:00
2006-02-22 10:07:54 +01:00
2006-02-22 10:07:54 +01:00
2006-02-22 10:07:54 +01:00
2006-05-11 18:12:06 +02:00
2006-05-02 20:10:02 +02:00
2006-02-18 17:26:30 +01:00
2006-02-24 16:31:38 +01:00
2006-05-18 18:38:50 +02:00
2006-03-13 15:34:30 +01:00
2006-05-19 19:07:33 -07:00
2006-03-09 20:41:21 +03:00
2006-03-09 12:00:12 +01:00
2006-05-12 11:26:42 +03:00
2006-04-22 04:38:22 -04:00
2006-05-11 19:47:00 -07:00
2006-02-22 10:07:54 +01:00
2006-03-10 14:40:15 +03:00
2006-05-03 19:01:29 +05:00
2006-03-09 12:08:23 +01:00
2006-02-25 21:54:34 +02:00
2006-03-30 19:12:10 +04:00
2006-03-30 19:12:10 +04:00
2006-04-18 18:10:47 +02:00
2006-02-24 18:34:15 +02:00
2006-05-30 16:07:49 +03:00
2006-02-24 18:34:15 +02:00
2006-02-18 19:07:32 +01:00
2006-04-12 17:37:57 +04:00
2006-05-25 19:20:34 +05:00
2006-02-24 18:34:15 +02:00
2006-05-25 10:39:18 +03:00
2006-03-10 16:47:56 +02:00
2006-03-10 16:47:56 +02:00
2006-02-21 10:37:10 +01:00
2006-02-25 21:54:34 +02:00
2006-04-24 18:57:00 +04:00
2006-04-22 11:54:25 +04:00
2006-05-18 13:35:15 +02:00
2006-03-24 14:58:18 +03:00
2006-05-18 11:56:50 +02:00
2006-04-04 17:54:58 -07:00
2006-04-04 17:54:58 -07:00
2006-03-03 15:29:39 +04:00
2006-03-22 16:47:45 +01:00
2006-03-23 08:21:16 +01:00
2006-04-27 16:32:40 +02:00
2006-03-06 16:20:15 +04:00
2006-04-12 14:45:37 +05:00
2006-02-24 16:19:55 +01:00
2006-04-26 17:09:41 -07:00
2006-05-19 19:07:33 -07:00
2006-05-30 16:07:49 +03:00
2006-05-24 20:52:57 +04:00
2006-02-16 12:02:38 +01:00
2006-05-23 15:45:16 +02:00
2006-05-03 09:08:12 +05:00