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

Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/t/explain.test
Text conflict in sql/net_serv.cc
Text conflict in sql/sp_head.cc
Text conflict in sql/sql_priv.h
2010-05-07 20:17:55 +04:00
..
2010-01-11 18:47:27 -07:00
2010-05-07 13:37:16 +04:00
2009-08-20 14:30:59 +02:00
2010-02-27 11:43:32 +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-24 13:15:34 +04:00
2010-02-24 13:15:34 +04:00
2010-01-15 15:42:15 +04:00
2010-01-15 15:42:15 +04:00
2009-12-11 12:39:38 +03:00
2009-12-08 10:53:40 +03:00
2010-02-04 20:34:15 +03:00
2009-12-09 18:56:34 +03:00
2009-09-10 03:18:29 -06:00
2009-06-01 16:00:38 +04:00
2010-04-13 19:04:45 +04:00
2010-04-13 19:04:45 +04:00
2009-09-10 03:18:29 -06:00
2010-03-19 11:29:12 +03:00
2009-11-04 10:17:39 +01:00
2010-02-11 18:32:53 +01: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-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-03 03:06:42 +03:00
2009-11-20 22:51:12 +03:00
2009-09-10 03:18:29 -06:00
2010-04-27 13:58:21 +04:00
2010-01-18 23:19:19 +03:00
2010-01-15 15:42:15 +04:00
2010-01-15 15:42:15 +04:00
2009-11-06 17:54:19 +03: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
2010-02-24 00:22:19 -07:00
2009-12-29 15:19:05 +03:00
2009-10-27 14:09:36 +04:00
2009-11-20 22:51:12 +03:00
2009-12-11 12:39:38 +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
2010-04-19 15:35:13 +02:00
2009-09-10 03:18:29 -06:00
2010-04-19 15:35:13 +02:00
2010-01-15 15:42:15 +04:00
2009-11-20 23:30:00 +03:00
2010-03-19 11:29:12 +03:00
2009-09-28 16:48:40 +03:00
2010-01-15 15:42:15 +04:00
2010-01-15 15:42:15 +04:00
2009-12-11 15:24:23 +03:00
2010-02-27 11:43:32 +04:00
2009-12-16 10:48:07 +03:00