into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1

  changed default for nbdcluster to DISABLED


sql/mysqld.cc:
  changed default for nbdcluster to DISABLED

  cosmetic


mysql-test/ndb/install_ndbcluster:
  cosmetic

into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1

  fix for embedded server and ndbcluster make


libmysqld/Makefile.am:
  fix for embedded server and ndbcluster make

into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1

libmysqld/Makefile.am:
  Add the new file discover.cc to Makefile.am in libmysqld/ dir to make it be symlinked and built for embebedded server.

fixed syntax errro


mysql-test/install_test_db.sh:
  fixed option name
sql/mysqld.cc:
  fixed syntax error
  allow --skip-ndbcluster if server is not compiled

at least slightly.

into neptunus.(none):/home/magnus/mysql-4.1

Fix broken string constant in mysqld.cc


mysql-test/mysql-test-run.sh:
  Don't enable NDB when the slave mysqld is started
  Remove the ndbcluster dir from var/ when restarting test
  Set datadir for NDB to @MYSQL_TEST_DIR/var so that ndbcluster dir is created there. Otherwise it will appear as a database in mysqld.
sql/mysqld.cc:
  The string was broken in two lines and failed to compile on some compiler.
  Remove ifdefs around OPT_NDBCLUSTER, it should always be available even when not supported.

  added --with-ndbcluster switch


scripts/make_binary_distribution.sh:
  added --with-ndbcluster switch

Added one test case for ndb to mysql-test-run, ndb_basic. It will show that
NDB Cluster is supported.


mysql-test/install_test_db.sh:
  Added --skip-ndb wile installing test db
mysql-test/mysql-test-run.sh:
  To enable NDB use --ndbcluster and to disable it --skip-ndbcluster or --skip-ndb
mysql-test/r/ndb_basic.result:
  Updated testcase to use all uppercase
mysql-test/t/ndb_basic.test:
  Updated testcase to use all uppercase

include/my_base.h:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysql_priv.h:
  Auto merged

sql/gen_lex_hash.cc:
  Minor changes 
   - fix space between for and (
sql/item_subselect.cc:
  Minor changes 
   - fix space between for and (
sql/sql_lex.cc:
  Minor changes 
   - fix space between for and (
sql/sql_string.cc:
  Minor changes 
   - fix space between for and (

include/my_base.h:
  Added three new errorcodes to be returned by the handler
sql/Makefile.am:
  Add new files discover.cc, ha_ndbcluster.cc and ha_ndbcluster.h
  Add include path of NDB files
sql/handler.cc:
  Added variable for keeping track of number of "discovers"
  Added NDB to list of storage engines
  Added calls to NDB for commit, rollback etc.
  Added function ha_discover for discovering a table from handler
sql/handler.h:
  Added NDB to list of storage engines
  Added vbariable in transaction for keeping a ndb transaction handle
sql/lex.h:
  Changed AND to AND_SYM and OR to OR_SYM to avoid nameclash
sql/mysql_priv.h:
  Added prototypes for new functions readfrm, writefrm and create_table_from_handler
sql/mysqld.cc:
  Added NDB support
  Disable NDB with --skip-ndbcluster
sql/set_var.cc:
  Add posibilty to show if NDB handler is supported
sql/ha_ndbcluster.cc:
  Add ifdef for whole file for not compiling anything if NDB sholdn't be included
  Updated timestamp handling to use new vars timestamp_default_now and timestamp_on_update_now
sql/sql_base.cc:
  If frm file is not found on disk, ask handler if it knows about the table. Then retry the open.
  This new functionality is called "discover" and can be used by any handler.
sql/sql_class.h:
  Added variable for keeping a NDB connection handle
sql/sql_table.cc:
  Before trying to create a table, ask handler if a table with that name already exists.
  If user said CREATE TABLE IF NOT EXISTS, disocver the table from handler
sql/sql_yacc.yy:
  Add NDBCLUSTER_SYM
  Change AND to AND_SYM
  Change OR to OR_SYM
sql/table.cc:
  Fixe for probelm when NullS is returned from bas_ext of a handler.

sql/sql_parse.cc:
   - Fixed compile error

BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Merged in example storage engine with NDB
configure.in:
  Resolved conflict between NDB check with EXAMPLE DB.

acinclude.m4:
  Typo fix (extra paren). 
  D'oh!

into mc05.(none):/space/tomas/mysql-4.1

into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples


BitKeeper/etc/logging_ok:
  auto-union
include/my_base.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into neptunus.(none):/home/magnus/mysql-4.1_2

acconfig.h:
  Clear variable that defines if NDB Cluster should be supported
acinclude.m4:
  Check for NDB Cluster included in the build
configure.in:
  Check if NDB Cluster should be supported

  added options for ndbcluster


mysql-test/mysql-test-run.sh:
  added options for ndbcluster

  Logging to logging@openlogging.org accepted
stop_ndbcluster, ndb_config_2_node.ini, install_ndbcluster:
  new file


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/deleted/.del-README~77a28de1261a882e:
  Delete: ndb/demos/1-node-PS/filesystem/README
BitKeeper/deleted/.del-README~632b4134464fe1b1:
  Delete: ndb/demos/1-node-SS/filesystem/README
BitKeeper/deleted/.del-README~b52220261b39f13e:
  Delete: ndb/demos/1-node/1-db-2/filesystem/README
BitKeeper/deleted/.del-README~3ef0e23d164673dc:
  Delete: ndb/demos/2-node/2-db-2/filesystem/README
BitKeeper/deleted/.del-README~7db9e56a65fe654d:
  Delete: ndb/demos/2-node/2-db-3/filesystem/README

BitKeeper/etc/ignore:
  Added ndb/bin/DbAsyncGenerator ndb/bin/DbCreate ndb/bin/acid ndb/bin/async-lmc-bench-l-p10.sh ndb/bin/async-lmc-bench-l.sh ndb/bin/async-lmc-bench-p10.sh ndb/bin/async-lmc-bench.sh ndb/bin/atrt ndb/bin/atrt-analyze-result.sh ndb/bin/atrt-clear-result.sh ndb/bin/atrt-gather-result.sh ndb/bin/atrt-setup.sh ndb/bin/bankCreator ndb/bin/bankMakeGL ndb/bin/bankSumAccounts ndb/bin/bankTimer ndb/bin/bankTransactionMaker ndb/bin/bankValidateAllGLs ndb/bin/basicTransporterTest ndb/bin/benchronja ndb/bin/bulk_copy ndb/bin/copy_tab ndb/bin/create_all_tabs ndb/bin/create_index ndb/bin/create_tab ndb/bin/delete_all ndb/bin/desc ndb/bin/drop_all_tabs ndb/bin/drop_index ndb/bin/drop_tab ndb/bin/flexAsynch ndb/bin/flexBench ndb/bin/flexHammer ndb/bin/flexScan ndb/bin/flexTT ndb/bin/hugoCalculator ndb/bin/hugoFill ndb/bin/hugoLoad ndb/bin/hugoLockRecords ndb/bin/hugoPkDelete ndb/bin/hugoPkRead ndb/bin/hugoPkReadRecord ndb/bin/hugoPkUpdate ndb/bin/hugoScanRead ndb/bin/hugoScanUpdate ndb/bin/index ndb/bin/index2 ndb/bin/ini
  ronja ndb/bin/interpreterInTup ndb/bin/list_tables ndb/bin/make-config.sh ndb/bin/mgmtclient ndb/bin/mgmtsrvr ndb/bin/mkconfig ndb/bin/ndb ndb/bin/ndb_cpcc ndb/bin/ndb_cpcd ndb/bin/ndb_rep ndb/bin/ndbsql ndb/bin/newton_basic ndb/bin/newton_br ndb/bin/newton_pb ndb/bin/newton_perf ndb/bin/perfTransporterTest ndb/bin/printConfig ndb/bin/printSchemafile ndb/bin/printSysfile ndb/bin/redoLogFileReader ndb/bin/restart ndb/bin/restarter ndb/bin/restarter2 ndb/bin/restarts ndb/bin/restore ndb/bin/select_all ndb/bin/select_count ndb/bin/telco ndb/bin/testBackup ndb/bin/testBank ndb/bin/testBasic ndb/bin/testBasicAsynch ndb/bin/testCopy ndb/bin/testDataBuffers ndb/bin/testDict ndb/bin/testGrep ndb/bin/testGrepVerify ndb/bin/testIndex ndb/bin/testInterpreter ndb/bin/testKernelDataBuffer ndb/bin/testLongSig ndb/bin/testMgm ndb/bin/testMgmapi ndb/bin/testNdbApi ndb/bin/testNodeRestart ndb/bin/testOIBasic ndb/bin/testOdbcDriver ndb/bin/testOperations ndb/bin/testRestartGci ndb/bin/testScan ndb/bin/testScanInterpreter 
  db/bin/testSimplePropertiesSection ndb/bin/testSystemRestart ndb/bin/testTimeout ndb/bin/testTransactions ndb/bin/test_cpcd ndb/bin/test_event ndb/bin/verify_index ndb/bin/waiter ndb/examples/ndbapi_example1/ndbapi_example1 ndb/examples/ndbapi_example2/ndbapi_example2 ndb/examples/ndbapi_example3/ndbapi_example3 ndb/examples/ndbapi_example5/ndbapi_example5 ndb/examples/select_all/select_all ndb/lib/libMGM_API.so ndb/lib/libNDB_API.so ndb/lib/libNDB_ODBC.so ndb/lib/libNEWTON_API.so ndb/lib/libNEWTON_BASICTEST_COMMON.so ndb/lib/libREP_API.so ndb/lib/libndbclient.so ndb/lib/libndbclient_extra.so to the ignore list

BitKeeper/etc/ignore:
  Added files and dirs to ignore

BitKeeper/deleted/.del-init_rm.c~47230fcd35059112:
  Delete: ndb/tools/init_rm/init_rm.c
ndb/examples/Makefile:
  Add target for clean_dep
ndb/src/Makefile:
  Remove env dir
ndb/test/ndbapi/Makefile:
  Remove some old stuff
ndb/test/ndbapi/flexAsynch/Makefile:
  Cleanup
ndb/test/ndbapi/flexBench/Makefile:
  Cleanup
ndb/test/ndbapi/flexTT/Makefile:
  Cleanup
ndb/test/odbc/Makefile:
  Don't compile test dm-unixodb for now
ndb/tools/Makefile:
  Remove init_rm tool

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

acconfig.h:
  Default undef for example storage engine.
acinclude.m4:
  Build macro additions for example engine.
configure.in:
  Configure changes for it to be listed in --help
sql/Makefile.am:
  Added in paths to build example.
sql/examples/ha_example.cc:
  Correction in indention and a few minor other corrections. It now lets you create/open/drop example engine.
sql/handler.cc:
  Added definition for the example storage engine. Added case for it to be created.
sql/handler.h:
  Added example storage engine type.
sql/mysql_priv.h:
  Added flag for optional build of example storage engine.
sql/mysqld.cc:
  Pieces to build example storage engine.

sql/sql_delete.cc:
  Added missing return
sql/sql_lex.cc:
  Comment fixes
sql/sql_parse.cc:
  Comment fixes