unknown 6e18e4f3e6 merge ...

storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Rename: ndb/src/kernel/error/ndbd_exit_codes.c -> storage/ndb/src/kernel/error/ndbd_exit_codes.c
storage/ndb/src/kernel/vm/ndbd_malloc.cpp:
  Rename: ndb/src/kernel/vm/ndbd_malloc.cpp -> storage/ndb/src/kernel/vm/ndbd_malloc.cpp
storage/ndb/src/kernel/vm/ndbd_malloc.hpp:
  Rename: ndb/src/kernel/vm/ndbd_malloc.hpp -> storage/ndb/src/kernel/vm/ndbd_malloc.hpp
storage/ndb/test/sql/test_create_drop.pl:
  Rename: ndb/test/sql/test_create_drop.pl -> storage/ndb/test/sql/test_create_drop.pl
storage/ndb/test/sql/test_range_bounds.pl:
  Rename: ndb/test/sql/test_range_bounds.pl -> storage/ndb/test/sql/test_range_bounds.pl
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Rename: storage/ndb/include/ndbd_exit_codes.h -> storage/ndb/include/mgmapi/ndbd_exit_codes.h

2005-10-07 09:29:55 +02:00

..

BANK.sql

merge error

2005-09-15 12:53:59 +02:00

T1.sql

merge error

2005-09-15 12:53:59 +02:00

test_create_drop.pl

merge

2005-10-07 09:29:55 +02:00

test_range_bounds.pl

merge

2005-10-07 09:29:55 +02:00