Commit graph

1881 commits

Author SHA1 Message Date
unknown
9f7c9aa7d5 ndb - sol9x86: cc -xO3: fix optimizer error.
ndb/src/common/util/NdbSqlUtil.cpp:
  sol9x86: cc -xO3: fix optimizer error.
  Note: same expression remains in Field_newdate::val_int().
2005-02-03 23:56:13 +01:00
unknown
81abb11ad4 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1
2005-02-03 18:22:06 +01:00
unknown
a0687bb5a4 Merge mysql.com:/Users/mikron/mysql-4.1
into mysql.com:/Users/mikron/mysql-5.0


ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
2005-02-03 18:19:39 +01:00
unknown
377d419f4a Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-03 17:17:06 +01:00
unknown
024b25cea3 ndb - hugo
more removal of pNdb->closeTransaction


ndb/test/src/HugoTransactions.cpp:
  more removal of pNdb->closeTransaction
2005-02-03 17:16:00 +01:00
unknown
a6cb0e5ff1 ndb - use hugo methods all the way in hugo
more test program fixes
  replace pNdb->closeTransaction with closeTransaction(pNdb)


ndb/test/src/HugoTransactions.cpp:
  more test program fixes
    replace pNdb->closeTransaction with closeTransaction(pNdb)
2005-02-03 17:10:46 +01:00
unknown
d595ac8df8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2005-02-03 17:05:55 +01:00
unknown
e7c3dc943c merge
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/test/include/HugoOperations.hpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
2005-02-03 17:04:27 +01:00
unknown
a5463c252a corrected automerge error
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
  Auto merged
ndb/test/ndbapi/flexBench.cpp:
  Auto merged
ndb/test/ndbapi/flexHammer.cpp:
  Auto merged
ndb/test/ndbapi/flexTT.cpp:
  Auto merged
ndb/test/ndbapi/flex_bench_mysql.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  corrected automerge error
2005-02-03 17:00:51 +01:00
unknown
2253df9b60 bug#8281
NdbScanFilter, not a bug. But update example program


ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp:
  memset char[20] as all bytes are significant when comparing
2005-02-03 15:09:43 +01:00
unknown
4f1cbb6031 4.1 -> 5.0 merge
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
extra/perror.c:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/rem0rec.ic:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
mysql-test/r/derived.result:
  Auto merged
mysql-test/r/func_str.result:
  Simple merge
mysql-test/r/subselect.result:
  Automatic merge
mysql-test/t/derived.test:
  Automatic merge
mysql-test/t/func_str.test:
  Simple merge
mysql-test/t/subselect.test:
  Automatic merge
mysys/my_handler.c:
  Automatic merge
ndb/src/kernel/blocks/backup/Backup.cpp:
  Automatic merge
scripts/make_binary_distribution.sh:
  Automatic merge
scripts/mysql_install_db.sh:
  Automatic merge
sql/examples/ha_archive.cc:
  Simple merge
sql/ha_innodb.cc:
  Automatic merge
sql/item.cc:
  Merge
sql/item_cmpfunc.h:
  Automatic merge
sql/item_func.cc:
  Simple merge
sql/item_func.h:
  Automatic merge
sql/item_strfunc.cc:
  Automatic merge
sql/item_strfunc.h:
  Automatic merge
sql/item_subselect.cc:
  Automatic merge
sql/mysqld.cc:
  Automatic merge
sql/set_var.cc:
  Automatic merge
sql/sql_base.cc:
  Automatic merge
sql/sql_class.cc:
  Automatic merge
sql/sql_class.h:
  Automatic merge
sql/sql_lex.cc:
  Automatic merge
sql/sql_lex.h:
  Automatic merge
sql/sql_parse.cc:
  Automatic merge
sql/sql_select.cc:
  Automatic merge
sql/sql_table.cc:
  Automatic merge
sql/sql_update.cc:
  Simple merge
strings/ctype-big5.c:
  Automatic merge
strings/ctype-bin.c:
  Automatic merge
strings/ctype-gbk.c:
  Automatic merge
strings/ctype-latin1.c:
  Automatic merge
strings/ctype-mb.c:
  Automatic merge
strings/ctype-simple.c:
  Automatic merge
strings/ctype-sjis.c:
  Automatic merge
strings/ctype-tis620.c:
  Automatic merge
strings/ctype-ucs2.c:
  Automatic merge
strings/ctype-utf8.c:
  Automatic merge
vio/viosocket.c:
  Automatic merge
vio/viossl.c:
  Automatic merge
2005-02-03 13:18:30 +02:00
unknown
ed26328745 ndb -
Remove extra NdbCond_signal when receiving TRANSID_AI
  and not being complete with operation


ndb/src/ndbapi/Ndbif.cpp:
  Remove extra NdbCond_signal when receiving TRANSID_AI
    and not being complete with operation
2005-02-03 11:41:36 +01:00
unknown
1bbfa6f75f ndb -
add abort to multi op test case


ndb/include/ndbapi/NdbConnection.hpp:
  Add aborts to test case
ndb/test/include/HugoOperations.hpp:
  Add aborts to test case
ndb/test/ndbapi/testOperations.cpp:
  Add aborts to test case
ndb/test/src/HugoOperations.cpp:
  Add aborts to test case
ndb/test/src/HugoTransactions.cpp:
  Add aborts to test case
2005-02-02 21:03:46 +01:00
unknown
4734f3f746 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-02 11:13:35 +01:00
unknown
e7ff746989 backported configure flag from 5.0
workaround for HPUX signal.h error, missing extern "C" 
    moved my_thread_end to NdbThreadExit
   more checks for shared memory transporter signum setup


acinclude.m4:
  backported configure flag from 5.0
include/my_global.h:
  workaround for HPUX signal.h error, missing extern "C"
ndb/src/common/portlib/NdbThread.c:
  moved my_thread_end to NdbThreadExit
ndb/src/mgmsrv/ConfigInfo.cpp:
  more checks for shared memory transporter signum setup
2005-02-02 10:50:33 +01:00
unknown
d54b72c9fc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-02 06:32:11 +01:00
unknown
1a2ef2be00 ndb - backup fix, found on powermacg4
ndb/src/kernel/blocks/backup/Backup.cpp:
  index typo overwrote attribute array, found on powermacg4
2005-02-02 03:58:43 +01:00
unknown
cf660b001e cleanup and streamlining of thread create/exit in ndb 2005-02-01 19:01:37 +01:00
unknown
6b7f067e8b merge 2005-02-01 17:16:05 +01:00
unknown
64412075e8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/mysqld.cc:
  Auto merged
2005-02-01 17:11:09 +01:00
unknown
3a890c8a87 ndb -
1) New testcase
   Check every combination of ins/upd/del of length 5
   Check reading savepoint's
2) Fix 1 liner in acc wrt committing read


ndb/include/ndbapi/NdbConnection.hpp:
  Make testcase friend
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix so that committing a READ can _not_ result in setting elementIsDisappeared
ndb/test/include/NDBT_Test.hpp:
  Make copy of testcase name
ndb/test/ndbapi/testOperations.cpp:
  New testcase
    Check every combination of ins/upd/del of length 5
    Check reading savepoint's
ndb/test/src/HugoOperations.cpp:
  Close transaction in destructor
ndb/test/src/NDBT_Test.cpp:
  Make copy of testcase name
2005-02-01 16:49:23 +01:00
unknown
af97b55308 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-01 10:05:22 +01:00
unknown
098fc22417 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl5


ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/cw/cpcd/main.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
2005-02-01 11:45:05 +11:00
unknown
8b08a2e87f Merge
BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
strings/ctype-simple.c:
  SCCS merged
2005-01-31 16:27:17 -08:00
unknown
0a507d2cf1 Fixed a bug in the ndbd scheduler with send of packed signals.
Fixing this bugs improves performance by 40% for very small read
statements and with 12-13 % for very simple updating transactions
(flexBench -o 10000) in single threaded application. Removes a fixed
cost of around 100.000 cycles every time the ndbd process wakes up to
execute some queries.


ndb/src/kernel/vm/FastScheduler.cpp:
  Integrate sendPacked into doJob
  The lack of integration meant that several loops in
  ipControlLoop were executed each time the ndbd process
  woke up, also for reads it meant that response was divided
  in two TCP/IP packets
  Is necessary to integrate this with overload protection
ndb/src/kernel/vm/ThreadConfig.cpp:
  Integrate sendPacked into doJob
  The lack of integration meant that several loops in
  ipControlLoop were executed each time the ndbd process
  woke up, also for reads it meant that response was divided
  in two TCP/IP packets
  Is necessary to integrate this with overload protection
2005-01-31 18:11:26 +01:00
unknown
4faf77a9fe BUG#8208 don't fsync unless something has been written
+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-31 11:47:10 +01:00
unknown
cdce11a32b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/docs/Makefile.am:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-01-29 07:11:22 +01:00
unknown
dde53fbb96 ndb_opt_defaults.h:
removed usage of SIGRTMIN temorarilly as it causes problems on some platforms


ndb/include/ndbapi/ndb_opt_defaults.h:
  removed usage of SIGRTMIN temorarilly as it causes problems on some platforms
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-28 19:28:14 +01:00
unknown
852bdc619a Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-01-28 17:15:51 +01:00
unknown
5c3c40798d small Makefile.am cleanup
clean: targets removed
    generated *.h files moved to include/


Docs/Images/Makefile.am:
  no clean: targets please!
client/Makefile.am:
  generated *.h files moved to include/
extra/Makefile.am:
  generated *.h files moved to include/
include/Makefile.am:
  no clean: targets please!
libmysql/Makefile.am:
  generated *.h files moved to include/
libmysql_r/Makefile.am:
  generated *.h files moved to include/
libmysqld/Makefile.am:
  generated *.h files moved to include/
libmysqld/examples/Makefile.am:
  generated *.h files moved to include/
  no clean: target please!
ndb/docs/Makefile.am:
  no clean: targets please!
scripts/Makefile.am:
  SUPERCLEANFILES means nothing
server-tools/instance-manager/Makefile.am:
  generated *.h files moved to include/
sql/Makefile.am:
  generated *.h files moved to include/
sql/share/Makefile.am:
  instead of (incorrectly) duplicating comp_err command line,
  call do make in extra/
tools/Makefile.am:
  generated *.h files moved to include/
BitKeeper/etc/ignore:
  Added include/mysqld_ername.h include/mysqld_error.h include/sql_state.h to the ignore list
2005-01-28 17:14:03 +01:00
unknown
b0c677c28e Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/export/space/pekka/ndb/version/my50
2005-01-28 13:01:01 +01:00
unknown
90904daf13 NdbScanFilter.hpp:
added docs


ndb/include/ndbapi/NdbScanFilter.hpp:
  added docs
2005-01-28 13:01:00 +01:00
unknown
7323172f7d Merge mysql.com:/export/space/pekka/ndb/version/my41
into mysql.com:/export/space/pekka/ndb/version/my50


ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
2005-01-28 10:56:37 +01:00
unknown
a332e08e31 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/export/space/pekka/ndb/version/my50
2005-01-28 10:52:54 +01:00
unknown
bc12f67343 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/export/space/pekka/ndb/version/my41
2005-01-28 10:52:31 +01:00
unknown
9b3bfa5f14 ndb - fix DATE printout
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix DATE printout
2005-01-28 10:51:30 +01:00
unknown
0e5cfcfd6c Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-28 09:16:04 +01:00
unknown
9aad0ae359 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-28 09:16:02 +01:00
unknown
bd556f0d70 NdbThread.c:
wrong order in c-file


ndb/src/common/portlib/NdbThread.c:
  wrong order in c-file
2005-01-28 09:15:01 +01:00
unknown
296f955599 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2005-01-28 08:11:56 +01:00
unknown
cca25e4d49 Merge
ndb/include/Makefile.am:
  Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/tools/delete_all.cpp:
  Auto merged
ndb/tools/desc.cpp:
  Auto merged
ndb/tools/drop_index.cpp:
  Auto merged
ndb/tools/drop_tab.cpp:
  Auto merged
ndb/tools/listTables.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  Auto merged
ndb/tools/select_count.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
ndb/include/util/ndb_opts.h:
  SCCS merged
ndb/src/mgmsrv/main.cpp:
  resolved merge conflict
2005-01-28 00:47:41 +01:00
unknown
df7bb879cd Bug#8167 signal usage clash between mysql server and ndb shared memory
added shared memory config parameter, signum for use in signalling
    added global variable for holdign signum to be used for shared memory connection
    only fiddle with signals if it is set
    simplified common ndb client option handling


ndb/include/Makefile.am:
  added common defaults file
ndb/include/mgmapi/mgmapi_config_parameters.h:
  added shared memory config parameter, signum for use in signalling
ndb/include/transporter/TransporterDefinitions.hpp:
  added shared memory config parameter, signum for use in signalling
ndb/include/util/ndb_opts.h:
  simplified common ndb client option handling
ndb/src/common/mgmcommon/IPCConfig.cpp:
  added shared memory config parameter, signum for use in signalling
ndb/src/common/portlib/NdbThread.c:
  added global variable for holdign signum to be used for shared memory connection
  only block signals if shared memory is used
ndb/src/common/transporter/SHM_Transporter.cpp:
  use signum in new global variable for shared memory signalling
ndb/src/common/transporter/TransporterRegistry.cpp:
  use signum in new global variable for shared memory signalling
  only fiddle with signals if it is set
ndb/src/cw/cpcd/main.cpp:
  ndb_opts not really used
ndb/src/kernel/vm/Configuration.cpp:
  simplified common ndb client option handling
ndb/src/mgmclient/main.cpp:
  simplified common ndb client option handling
ndb/src/mgmsrv/ConfigInfo.cpp:
  added shared memory config parameter, signum for use in signalling
ndb/src/mgmsrv/main.cpp:
  simplified common ndb client option handling
ndb/tools/delete_all.cpp:
  simplified common ndb client option handling
ndb/tools/desc.cpp:
  simplified common ndb client option handling
ndb/tools/drop_index.cpp:
  simplified common ndb client option handling
ndb/tools/drop_tab.cpp:
  simplified common ndb client option handling
ndb/tools/listTables.cpp:
  simplified common ndb client option handling
ndb/tools/restore/restore_main.cpp:
  simplified common ndb client option handling
ndb/tools/select_all.cpp:
  simplified common ndb client option handling
ndb/tools/select_count.cpp:
  simplified common ndb client option handling
ndb/tools/waiter.cpp:
  simplified common ndb client option handling
2005-01-28 00:42:41 +01:00
unknown
fce978c717 ndb - post-merge fix
ndb/include/ndb_constants.h:
  post-merge fix
2005-01-27 21:23:21 +01:00
unknown
763dfd7b10 Merge
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
ndb/src/ndbapi/NdbRecAttr.cpp:
  merge
2005-01-27 18:41:23 +01:00
unknown
1ed40339e2 ndb - make YEAR and TIMESTAMP into ndb types
mysql-test/r/ndb_index_ordered.result:
  make YEAR and TIMESTAMP into ndb types
mysql-test/t/ndb_index_ordered.test:
  make YEAR and TIMESTAMP into ndb types
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/include/ndbapi/NdbDictionary.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/include/util/NdbSqlUtil.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/common/util/NdbSqlUtil.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionary.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbRecAttr.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/test/include/NdbSchemaOp.hpp:
  make YEAR and TIMESTAMP into ndb types
sql/ha_ndbcluster.cc:
  make YEAR and TIMESTAMP into ndb types
2005-01-27 17:33:35 +01:00
unknown
b49b158581 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-27 12:23:18 +01:00
unknown
c6de5793d8 ndb - Make sure to install 16-node tests
ndb/test/run-test/Makefile.am:
  Make sure to instal 16 -node tests
2005-01-27 11:10:20 +01:00
unknown
8d35dbaf1c moved sorting and duplicate check for unique indexes from api to kernel
ndb/Makefile.am:
  added ndbapi-examples directory to src distibution
2005-01-27 10:44:47 +01:00
unknown
1cd8eaa777 Makefile.am:
updated doxygen Makefile for changed examples directory
.del-demos.tar~8e6dfbc510a6e323:
  Delete: ndb/ndbapi-examples/configurations/demos.tar
Many files:
  mvdir


ndb/ndbapi-examples/Makefile:
  mvdir
ndb/ndbapi-examples/mgmapi_logevent_example/Makefile:
  mvdir
ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_async_example/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_async_example/readme.txt:
  mvdir
ndb/ndbapi-examples/ndbapi_async_example1/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_event_example/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_retries_example/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_scan_example/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_scan_example/readme.txt:
  mvdir
ndb/ndbapi-examples/ndbapi_simple_example/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp:
  mvdir
ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile:
  mvdir
ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp:
  mvdir
BitKeeper/deleted/.del-demos.tar~8e6dfbc510a6e323:
  Delete: ndb/ndbapi-examples/configurations/demos.tar
ndb/docs/Makefile.am:
  updated doxygen Makefile for changed examples directory
2005-01-26 16:42:52 +01:00
unknown
c085930fa2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-01-26 11:34:18 +01:00