mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/ndb/tools
History
unknown 64f5ce7ec3 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Manual merge
storage/ndb/src/common/util/InputStream.cpp:
  Manual merge
2006-12-05 19:19:58 +01:00
..
restore Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 2006-12-01 16:37:13 +01:00
clean-links.sh Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
delete_all.cpp Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 2006-10-05 23:13:29 +10:00
desc.cpp Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
drop_index.cpp Merge mysql.com:/home/my/mysql-5.0 2006-11-22 14:11:36 +02:00
drop_tab.cpp Merge mysql.com:/home/my/mysql-5.0 2006-11-22 14:11:36 +02:00
listTables.cpp Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 2006-10-05 23:13:29 +10:00
make-errors.pl Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
make-links.sh Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Makefile.am Merge 2006-03-30 22:10:48 +02:00
ndb_condig.cpp Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-12-05 19:19:58 +01:00
ndb_error_reporter wl2723 - ndb opt. nr 2006-01-11 11:35:25 +01:00
ndb_size.pl Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 2006-11-02 03:30:16 +03:00
ndb_size.tmpl Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 2006-11-02 03:30:16 +03:00
ndb_test_platform.cpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndbsql.cpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
rgrep Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
select_all.cpp Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 2006-10-05 23:13:29 +10:00
select_count.cpp Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 2006-10-05 23:13:29 +10:00
waiter.cpp Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 2006-10-05 23:13:29 +10:00