1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-28 13:01:41 +03:00
unknown 1f89605e4b Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
VC++Files/libmysqld/libmysqld.vcproj:
  Use original file (my_user.c was already added in 5.1)
mysql-test/mysql-test-run.pl:
  Manual merge
sql/handler.h:
  Manual merge
sql/share/errmsg.txt:
  Align error messages with 5.0
sql/sql_table.cc:
  Manual merge
storage/ndb/src/ndbapi/NdbBlob.cpp:
  No changes
2006-05-04 15:58:30 +03:00
..
2006-05-03 16:33:42 +05:00
2006-03-14 09:37:29 -08:00
2006-02-15 02:19:42 +02:00
2006-03-28 13:28:35 +02:00
2006-04-07 11:29:15 +02:00
2006-03-06 23:20:19 +01:00
2006-04-25 13:04:39 +04:00
2006-03-06 23:20:19 +01:00
2006-03-06 23:20:19 +01:00
2006-01-12 19:51:02 +01:00
2006-03-06 23:43:47 +01:00
2006-03-06 20:06:56 +01:00
2006-05-04 06:28:24 +03:00
2006-01-12 19:51:02 +01:00
2006-05-04 06:28:24 +03:00
2006-03-11 15:52:38 +01:00
2006-04-17 20:24:41 +02:00
2006-05-04 06:28:24 +03:00
2006-03-14 09:37:29 -08:00
2006-03-10 14:36:48 +01:00
2006-01-12 19:51:02 +01:00
2006-02-26 15:11:56 +02:00
2006-04-17 18:56:58 -04:00
2006-02-26 15:11:56 +02:00
2006-02-09 15:29:57 +01:00
2006-02-09 15:29:57 +01:00
2006-02-13 16:36:11 +01:00
2006-02-13 16:36:11 +01:00
2006-03-11 15:52:38 +01:00
2006-03-11 15:52:38 +01:00
2006-02-15 14:02:47 +01:00
2006-01-12 19:51:02 +01:00
2006-03-11 15:52:38 +01:00
2006-02-10 12:52:35 +01:00
2006-02-10 12:52:35 +01:00
2006-02-15 14:02:47 +01:00
2006-05-01 00:14:32 -07:00
2006-03-10 17:31:07 +01:00
2006-02-08 10:33:21 +01:00
2006-02-15 14:02:47 +01:00
2006-03-06 20:09:16 +01:00
2006-02-17 00:54:00 +01:00
2006-05-03 16:47:05 +05:00
2006-03-25 13:14:52 +01:00
2006-03-09 21:00:45 +03:00
2006-03-06 23:20:19 +01:00
2006-03-14 09:37:29 -08:00
2006-03-06 23:20:19 +01:00
2006-03-31 21:26:17 -08:00
2006-03-14 09:37:29 -08:00