1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-12 08:01:43 +03:00
Files
mariadb/mysql-test/r
unknown 596bf8ec02 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Merge 5.0-ndb into 5.1-ndb


storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_debug.h:
  Auto merged
storage/ndb/include/util/Parser.hpp:
  Auto merged
storage/ndb/include/util/socket_io.h:
  Auto merged
storage/ndb/src/common/util/InputStream.cpp:
  Auto merged
storage/ndb/src/common/util/Parser.cpp:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/testMgm.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/drop_tab.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged
storage/ndb/tools/select_count.cpp:
  Auto merged
storage/ndb/tools/waiter.cpp:
  Auto merged
mysql-test/r/ndb_config.result:
  manual merge
mysql-test/t/ndb_config.test:
  manual merge
storage/ndb/include/util/InputStream.hpp:
  manual merge
storage/ndb/tools/desc.cpp:
  manual merge
storage/ndb/tools/ndb_condig.cpp:
  manual merge
storage/ndb/tools/restore/restore_main.cpp:
  manual merge
storage/ndb/tools/select_all.cpp:
  manual merge
2006-10-05 23:13:29 +10:00
..
2006-07-06 15:38:47 +02:00
2006-09-08 00:49:37 +02:00
2006-09-08 00:49:37 +02:00
2006-06-09 12:27:28 -07:00
2006-05-24 17:21:35 +03:00
2006-06-15 01:48:41 +04:00
2006-08-01 18:55:44 +04:00
2006-08-18 22:29:35 +05:00
2006-09-05 16:28:31 -04:00
2006-08-30 23:09:47 +04:00
2006-06-11 09:04:23 +02:00
2006-07-20 12:54:01 -07:00
2006-09-13 15:37:35 -06:00
2006-07-04 12:34:23 +02:00
2006-06-14 10:54:56 +05:00
2006-06-27 18:35:10 +02:00
2006-05-31 23:34:28 +02:00
2006-09-14 12:32:49 +02:00
2006-06-26 15:08:09 +02:00
2006-09-14 12:32:49 +02:00
2006-07-30 18:25:57 +04:00
2006-06-27 18:35:10 +02:00
2006-06-27 18:35:10 +02:00
2006-09-01 16:14:59 +02:00
2006-06-15 16:51:24 +02:00
2006-06-09 16:20:23 +02:00
2006-08-29 09:30:58 -04:00
2006-08-14 16:50:52 -07:00
2006-06-18 14:56:35 +04:00
2006-05-31 23:34:28 +02:00
2006-06-01 12:41:57 +02:00
2006-08-01 08:49:43 +04:00
2006-08-29 10:47:28 +02:00
2006-06-12 14:23:21 +02:00
2006-08-29 10:47:28 +02:00
2006-05-31 23:34:28 +02:00
2006-09-01 16:14:59 +02:00
2006-06-09 16:20:23 +02:00
2006-06-01 12:41:57 +02:00
2006-05-31 23:34:28 +02:00
2006-05-18 21:40:52 +02:00
2006-05-31 23:34:28 +02:00
2006-07-30 18:25:57 +04:00
2006-06-09 19:29:39 -07:00
2006-08-16 20:39:33 -07:00