1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Files
mariadb/mysql-test/r
unknown d7becbc2c8 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


BitKeeper/deleted/.del-ndb_load.result:
  Delete: mysql-test/r/ndb_load.result
BitKeeper/deleted/.del-ndb_load.test:
  Delete: mysql-test/t/ndb_load.test
extra/perror.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/sp-destruct.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge.
2006-02-09 13:35:59 +03:00
..
2005-11-21 21:11:28 +04:00
2005-10-13 11:28:06 +02:00
2006-01-28 10:37:22 +01:00
2006-01-12 13:08:49 +04:00
2005-09-08 18:15:05 +01:00
2005-09-15 21:05:42 +02:00
2006-01-12 19:51:02 +01:00
2005-08-29 22:35:48 -05:00
2005-08-15 14:19:56 -07:00
2006-01-21 21:50:54 +04:00
2006-02-07 13:26:35 +01:00
2005-08-26 22:25:45 -07:00
2005-11-01 11:43:34 +04:00
2005-09-09 12:47:57 +02:00
2006-02-06 11:35:13 -08:00
2006-01-06 00:47:49 +02:00
2006-01-12 19:51:02 +01:00
2006-02-02 23:56:08 -08:00
2006-02-03 00:07:36 +03:00
2006-02-03 02:01:01 +03:00
2005-12-06 21:28:13 +01:00
2006-01-27 21:20:28 -08:00
2006-02-03 00:07:36 +03:00
2005-09-14 12:24:14 +03:00
2005-12-06 21:28:13 +01:00
2006-01-12 12:27:25 -08:00
2006-01-12 19:51:02 +01:00
2005-11-06 00:20:37 +01:00
2006-01-12 19:51:02 +01:00
2006-01-12 19:51:02 +01:00
2006-01-12 19:51:02 +01:00
2006-01-19 13:32:58 -05:00
2006-01-17 08:40:00 +01:00
2006-02-07 19:57:31 +01:00
2006-01-12 19:51:02 +01:00
2005-12-14 00:23:46 +02:00
2006-01-12 19:51:02 +01:00
2005-09-15 22:21:30 +04:00
2006-01-18 14:09:08 +03:00
2006-01-12 19:51:02 +01:00
2006-01-12 19:51:02 +01:00
2006-01-12 19:51:02 +01:00
2006-01-12 19:51:02 +01:00
2006-01-12 19:51:02 +01:00
2006-01-12 19:51:02 +01:00
2006-02-08 17:47:27 +01:00
2006-01-12 19:51:02 +01:00
2006-01-12 19:51:02 +01:00
2006-01-12 19:51:02 +01:00
2006-01-12 19:51:02 +01:00
2006-02-08 10:33:21 +01:00
2006-02-08 17:47:27 +01:00
2006-02-08 22:26:16 +01:00
2005-12-23 14:45:02 +01:00
2006-01-12 19:51:02 +01:00
2006-01-13 16:27:38 +03:00
2005-12-12 13:29:48 +03:00
2005-10-13 11:28:06 +02:00
2005-10-13 11:28:06 +02:00
2005-10-10 19:38:58 +02:00
2006-01-21 18:50:06 +04:00
2005-12-12 13:29:48 +03:00
2005-11-30 13:10:08 -08:00