unknown
7f70e111dd
Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge
...
into myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1
mysql-test/r/sp_notembedded.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/handler.h:
manual merge
sql/table.cc:
manual merge
sql/unireg.cc:
manual merge
tests/mysql_client_test.c:
SCCS merged
2006-07-18 18:43:55 +05:00
..
2006-07-13 17:34:49 +04:00
2006-05-30 10:22:31 +02:00
2006-06-26 18:45:46 +04:00
2006-05-02 17:53:26 -07:00
2006-05-30 18:21:03 +02:00
2006-06-20 17:14:36 +02:00
2006-06-08 23:07:11 +02:00
2006-07-07 03:07:45 +04:00
2006-06-20 17:05:41 +02:00
2006-06-08 23:07:11 +02:00
2006-07-07 13:49:43 +04:00
2006-06-08 23:07:11 +02:00
2006-07-15 01:04:51 +04:00
2006-07-06 16:09:50 +02:00
2006-07-06 16:09:50 +02:00
2006-06-28 14:03:08 +03:00
2006-06-06 02:47:30 +03:00
2006-06-04 21:05:22 +03:00
2006-07-12 10:07:07 +02:00
2006-07-10 11:57:29 -07:00
2006-06-04 21:05:22 +03:00
2006-06-04 21:05:22 +03:00
2006-06-23 17:27:54 -04:00
2006-06-04 21:05:22 +03:00
2006-07-15 03:38:34 -04:00
2006-06-04 21:05:22 +03:00
2006-06-04 21:05:22 +03:00
2006-06-15 10:58:02 +02:00
2006-07-08 03:26:13 +02:00
2006-06-12 14:23:21 +02:00
2006-03-01 13:31:21 +01:00
2006-07-14 02:07:37 +04:00
2006-07-01 00:19:23 -04:00
2006-07-15 04:06:31 -04:00
2006-07-15 03:59:53 -04:00
2006-07-10 18:41:03 +02:00
2006-07-18 18:43:55 +05:00
2006-04-15 18:17:32 -07:00
2005-12-31 09:01:26 +04:00
2006-06-15 16:24:02 +05:00
2006-07-13 22:09:36 +04:00
2006-06-28 16:28:29 +03:00
2006-07-09 17:00:47 +02:00
2005-12-21 17:13:52 +04:00
2006-07-13 22:09:36 +04:00
2006-07-13 22:09:36 +04:00
2005-10-31 11:54:36 +02:00
2006-07-05 11:20:10 +02:00
2006-06-04 18:52:22 +03:00
2006-06-04 18:52:22 +03:00
2006-07-13 22:09:36 +04:00
2006-06-14 10:54:56 +05:00
2006-06-04 21:05:22 +03:00
2006-06-04 21:05:22 +03:00
2006-07-13 22:09:36 +04:00
2006-06-04 18:52:22 +03:00
2006-07-06 13:18:00 +02:00
2006-06-18 14:56:35 +04:00
2005-11-23 22:45:02 +02:00
2005-11-20 20:47:07 +02:00
2006-07-14 02:07:37 +04:00
2006-05-31 13:32:14 -04:00
2006-07-18 18:43:55 +05:00
2006-07-18 18:43:55 +05:00
2006-06-21 13:00:19 +05:00
2006-05-23 11:25:11 -07:00
2006-07-04 10:02:11 +02:00
2006-07-13 17:34:49 +04:00
2006-07-03 11:35:58 -04:00
2006-07-11 12:17:19 +02:00
2006-06-21 14:53:40 +05:00
2006-06-21 08:58:56 +02:00
2006-03-24 22:50:56 +01:00
2005-11-23 20:16:06 +02:00
2006-04-15 18:17:32 -07:00
2006-07-18 18:43:55 +05:00
2006-07-10 17:20:39 -04:00
2006-06-17 00:30:02 +02:00
2006-07-14 19:10:54 +04:00
2006-06-04 18:52:22 +03:00
2006-07-05 11:11:40 +02:00
2006-03-27 19:48:44 -08:00
2006-03-28 01:01:51 +04:00
2006-06-14 09:12:07 -04:00
2006-06-27 22:19:27 +02:00
2006-06-27 22:19:27 +02:00
2006-03-29 14:27:36 +03:00
2006-06-16 12:17:20 +02:00
2006-06-16 12:17:20 +02:00
2006-02-24 18:34:15 +02:00
2006-06-04 18:52:22 +03:00
2006-05-22 20:46:13 +02:00
2006-07-07 16:14:07 +04:00
2006-07-07 16:14:07 +04:00
2006-06-23 15:05:15 +02:00
2006-06-23 15:05:15 +02:00
2006-06-07 23:58:08 +04:00
2005-12-22 06:39:02 +01:00
2006-01-01 22:18:02 +01:00
2006-07-10 17:20:39 -04:00
2006-07-07 21:03:19 +02:00
2006-07-07 18:31:00 +02:00
2006-06-28 23:47:45 +04:00
2006-03-28 19:34:44 +02:00
2006-07-15 01:04:51 +04:00
2006-07-11 12:17:19 +02:00
2006-04-18 11:07:34 +02:00
2006-04-18 11:07:34 +02:00
2006-05-15 12:01:55 +02:00
2006-05-15 12:01:55 +02:00
2006-07-11 12:17:19 +02:00
2006-06-27 00:47:52 +04:00
2006-06-04 21:05:22 +03:00
2006-06-28 16:28:29 +03:00
2006-07-18 18:43:55 +05:00
2006-05-11 11:28:56 +04:00
2006-06-16 12:17:20 +02:00
2006-06-16 12:17:20 +02:00
2006-07-11 12:17:19 +02:00
2006-03-01 12:45:13 +02:00
2006-06-04 18:52:22 +03:00
2006-04-13 13:49:29 -07:00
2006-04-09 17:48:47 +04:00
2006-02-25 17:46:30 +02:00
2006-07-11 12:17:19 +02:00
2006-07-13 17:34:49 +04:00
2006-06-19 12:45:34 +03:00
2006-04-07 23:58:17 +04:00
2006-07-13 11:43:52 +04:00
2006-07-10 18:41:03 +02:00
2005-11-23 22:45:02 +02:00
2006-06-04 18:52:22 +03:00
2006-03-23 18:14:02 +01:00
2006-05-22 20:46:13 +02:00
2006-07-04 10:02:11 +02:00
2006-06-04 18:52:22 +03:00
2006-07-13 00:18:59 +04:00
2006-07-15 01:04:51 +04:00
2006-07-15 01:04:51 +04:00
2005-12-22 06:39:02 +01:00
2006-07-13 00:18:59 +04:00
2005-11-07 16:25:06 +01:00
2005-11-07 16:25:06 +01:00
2005-12-19 14:16:21 +01:00
2006-06-04 18:52:22 +03:00
2006-07-18 18:43:55 +05:00
2006-06-28 11:55:15 +05:00
2006-06-27 22:19:27 +02:00
2006-06-12 06:50:11 -07:00
2006-06-12 06:50:11 -07:00
2006-06-20 13:20:32 +03:00
2006-02-27 20:00:07 +03:00
2006-06-04 18:52:22 +03:00
2005-12-22 06:39:02 +01:00
2006-07-13 11:43:52 +04:00
2006-06-28 16:28:29 +03:00
2006-07-18 18:43:55 +05:00
2005-12-22 06:39:02 +01:00
2006-06-19 13:00:36 +03:00
2006-06-16 12:17:20 +02:00
2006-07-18 18:43:55 +05:00
2006-06-12 06:50:11 -07:00
2006-05-04 22:27:12 +03:00
2006-07-13 11:43:52 +04:00
2006-07-06 13:33:23 +04:00
2006-07-06 22:55:48 +04:00
2006-06-08 13:25:28 -04:00
2006-07-01 00:01:37 -04:00
2006-07-09 22:50:02 +02:00
2006-07-11 12:17:19 +02:00
2005-12-21 10:18:40 -08:00
2006-07-18 18:43:55 +05:00
2005-12-31 12:34:39 +04:00
2006-07-09 17:52:19 +02:00
2006-07-18 18:43:55 +05:00
2006-07-18 18:43:55 +05:00
2006-07-06 15:38:47 +02:00
2006-07-06 22:55:48 +04:00
2006-05-02 18:41:42 -04:00
2006-04-28 11:37:20 +02:00
2006-01-03 17:54:54 +01:00
2006-07-18 18:43:55 +05:00
2006-04-12 23:05:38 +04:00