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

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

into mysql.com:/home/my/mysql-4.1


sql/item.cc:
  Auto merged

sql/item.cc:
  Smple optimization

into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1


sql/set_var.cc:
  Auto merged

sql/item_cmpfunc.cc:
  merged in one if
sql/mysql_priv.h:
  removed unused paremeter of check_one_table_access
  declaration of new function for SP share code
sql/set_var.cc:
  function descriotion added
  unneeded parantses removed
sql/sql_acl.cc:
  new parameter to limit number of checked tables for check_grant
sql/sql_acl.h:
  new parameter to limit number of checked tables for check_grant
sql/sql_delete.cc:
  preparation moved in separate function
sql/sql_insert.cc:
  preparation moved in separate function
sql/sql_lex.cc:
  comment style fixed
  unneeded assignment removed
sql/sql_parse.cc:
  new parameter to limit number of checked tables for check_grant
  table list manipulation removed (because of above)
  new precheck function
sql/sql_prepare.cc:
  function rewrited to shere code with sql_prepare.cc
  flow control fixed
sql/sql_show.cc:
  new parameter to limit number of checked tables for check_grant
sql/sql_update.cc:
  preparation moved in separate function
sql/table.h:
  flag renamed

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

into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1

mysql-test/r/lowercase_table2.result:
  Fixed typo
mysql-test/r/repair.result:
  Portability fix (For OpenBSD)
mysql-test/t/repair.test:
  Portability fix (For OpenBSD)
mysys/my_thr_init.c:
  Fixed crasch with some tests on OpenBSD.
sql/field.cc:
  Don't truncate big values (Caused a core dump on Linux-Alpha for big values)
sql/log.cc:
  More DBUG

sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

sql/sql_derived.cc:
  do not execute subqueries in the FROM clause in PS preparation
tests/client_test.c:
  test of subquery in FROM clause with parameter

change 10 to a #define'd constant


myisam/myisamdef.h:
  use a constant with a difficult-to-type name instead of two-digit number :)
sql/ha_myisam.cc:
  use a constant with a difficult-to-type name instead of two-digit number :)
sql/sql_insert.cc:
  always call start_bulk_insert (it performs all checks itself)
  removed spurious semicolon at the end of the "if" :)
  added a clarifying comment

Revert main parts of patch for online index builds. Should be done differently
Added support for %lx in my_snprintf()


sql/ha_myisam.cc:
  Don't enable HA_EXTRA_WRITE_CACHE if too few rows
sql/handler.h:
  Indentaion fix
sql/mysql_priv.h:
  Removed real_alter_table, mysql_add_column and mysql_drop_column
sql/sql_class.cc:
  After merge fix
sql/sql_insert.cc:
  Don't user bulk_insert if only one row (common case)
sql/sql_parse.cc:
  Added mysql_create_index() and mysql_drop_index() as these are only wrappers for mysql_alter_table()
sql/sql_table.cc:
  Revert main parts of patch for online index builds
  Changed back to use tabs to make merges possible between trees
sql/unireg.cc:
  Added comments and minor cleanup
strings/my_vsnprintf.c:
  Added support for %lx.
  Proper long support

into mysql.com:/home/my/mysql-4.1


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged

This gives the handler more optimization possiblities and is needed for NDB cluster
Fixed not-initialized memory error detected by valgrind


mysql-test/mysql-test-run.sh:
  Fixed address to manual page
mysql-test/r/gis-rtree.result:
  Added test to show fatal error in GIS
mysql-test/r/grant.result:
  New tests
mysql-test/t/gis-rtree.test:
  New tests
mysql-test/t/grant.test:
  New tests
sql/handler.cc:
  Moved reading of ranges from opt_range.cc to handler.cc
  This gives the handler more optimization possiblities and is needed for NDB cluster
sql/handler.h:
  Moved reading of ranges from opt_range.cc to handler.cc
  T
sql/opt_range.cc:
  Moved reading of ranges from opt_range.cc to handler.cc
  Simplified GIS get_next() handling
  Indentation cleanups
sql/opt_range.h:
  Removed not needed cmp_next()
  Added new QUICK_SELECT method for GIS keys to make code for normal keys easier and faster
sql/sql_select.cc:
  Fixed wrong handling of usable-keys in test_if_skip_sort_order (not fatal, just a warning from valgrind)
  Added DBUG
  Cleaned up comments

sql/item.cc:
  field->store resuts passing is fixed for REAL and INT
tests/client_test.c:
  removed debugging commnet
  fixed type casting
  test for BUG#3223

Cleanup/optimizations of structures and key usage to make it easier to move key-range-search to handler


sql/field.cc:
  Use 'HA_KEY_BLOB_LENGTH' instead of '2' for 'packed-length'
  Changed 'get_key_image' and 'set_key_image' to take length data part of key (without length-store bytes). This makes the interface easier to use from opt_range.cc
sql/field.h:
  Indentation fix
sql/opt_range.cc:
  Changed KEY_PART to use KEY_PART_INFO->store_length (which includes null-byte if needed)
  This makes some functions easier and allowed us to easier use the new get_key_image/set_key_image interfaces
  Simple loop optimization.
sql/opt_range.h:
  Changed part_length -> store_length and added length to KEY_PART.
  This make this structure more like KEY_PART_INFO
  Added 'sorted' to QUICK_SELECT for NDB
sql/sql_class.cc:
  Fixed compiler warning
sql/sql_select.cc:
  Set 'quick->sorted' if keys should be sorted (for NDB)
sql/table.cc:
  GEOMETRY KEYS doesn't have length prefix in keys

sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)


include/mysqld_error.h:
  new error for unsupported command in PS
mysql-test/r/multi_update.result:
  test sutes (BUG#3408, BUG#3411)
mysql-test/t/multi_update.test:
  test sutes (BUG#3408, BUG#3411)
sql/item_cmpfunc.cc:
  fixed IN subselect with basic constant left expression
sql/mysql_priv.h:
  some function frop sql_parse.h become public
sql/set_var.cc:
  check for SET command via PS
sql/set_var.h:
  check for SET command via PS
sql/share/czech/errmsg.txt:
  new error for unsupported command in PS
sql/share/danish/errmsg.txt:
  new error for unsupported command in PS
sql/share/dutch/errmsg.txt:
  new error for unsupported command in PS
sql/share/english/errmsg.txt:
  new error for unsupported command in PS
sql/share/estonian/errmsg.txt:
  new error for unsupported command in PS
sql/share/french/errmsg.txt:
  new error for unsupported command in PS
sql/share/german/errmsg.txt:
  new error for unsupported command in PS
sql/share/greek/errmsg.txt:
  new error for unsupported command in PS
sql/share/hungarian/errmsg.txt:
  new error for unsupported command in PS
sql/share/italian/errmsg.txt:
  new error for unsupported command in PS
sql/share/japanese/errmsg.txt:
  new error for unsupported command in PS
sql/share/korean/errmsg.txt:
  new error for unsupported command in PS
sql/share/norwegian-ny/errmsg.txt:
  new error for unsupported command in PS
sql/share/norwegian/errmsg.txt:
  new error for unsupported command in PS
sql/share/polish/errmsg.txt:
  new error for unsupported command in PS
sql/share/portuguese/errmsg.txt:
  new error for unsupported command in PS
sql/share/romanian/errmsg.txt:
  new error for unsupported command in PS
sql/share/russian/errmsg.txt:
  new error for unsupported command in PS
sql/share/serbian/errmsg.txt:
  new error for unsupported command in PS
sql/share/slovak/errmsg.txt:
  new error for unsupported command in PS
sql/share/spanish/errmsg.txt:
  new error for unsupported command in PS
sql/share/swedish/errmsg.txt:
  new error for unsupported command in PS
sql/share/ukrainian/errmsg.txt:
  new error for unsupported command in PS
sql/sql_lex.cc:
  first table unlincking procedures for CREATE command
sql/sql_lex.h:
  first table unlincking procedures for CREATE command
sql/sql_parse.cc:
  used function to exclude first table from list
  SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
  fixed multiupdate privelege check (BUG#3408)
  fixed multiupdate tables check (BUG#3411)
sql/sql_prepare.cc:
  fixed a lot of commands to be compatible with PS
  unchecked commands now is rejected to avoid serever crash
sql/sql_select.cc:
  allow empty result for PS preparing
sql/sql_union.cc:
  fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
sql/sql_update.cc:
  fixed update to use correct tables lists (BUG#3408)
sql/table.h:
  flag to support multi update tables check (BUG#3408)
tests/client_test.c:
  removed unsupported tables
  fixed show table test
  added new tests

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

or if not given, it will try to use the one in datadir, if possible, otherwise
log file will be disabled.

sql/handler.h:
  Auto merged
sql/sql_base.cc:
  Auto merged

sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged

HA_EXTRA_WRITE_CACHE now part of start_bulk_insert()
test cleanups


BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585:
  Delete: mysql-test/t/repair_part2-master.sh
BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001:
  Delete: mysql-test/t/repair_part2.test
BitKeeper/deleted/.del-repair_part2.result~72ca166fb248b566:
  Delete: mysql-test/r/repair_part2.result
mysql-test/r/myisam.result:
  updated
mysql-test/t/lowercase_table2.test:
  typo fixed
mysql-test/r/repair.result:
  single repair.test from repair_part[12].test
mysql-test/t/lowercase_table3.test:
  typo fixed
mysql-test/t/lowercase_table_qcache.test:
  newline added
mysql-test/t/myisam.test:
  updated
mysql-test/t/repair.test:
  single repair.test from repair_part[12].test
sql/field.cc:
  reverted
sql/field.h:
  style fix
sql/ha_myisam.cc:
  add HA_EXTRA_WRITE_CACHE to start_bulk_insert
sql/sql_insert.cc:
  add HA_EXTRA_WRITE_CACHE to start_bulk_insert
sql/sql_load.cc:
  add HA_EXTRA_WRITE_CACHE to start_bulk_insert
sql/sql_table.cc:
  add HA_EXTRA_WRITE_CACHE to start_bulk_insert

BitKeeper/etc/ignore:
  auto-union
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/unireg.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Hand-merged
sql/sql_yacc.yy:
  Hand-merged