into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged

- set table state in releaseTableObject
- make handleTabInfoInit release object if parsing fails
- make sure table is not accessed is parsing fails

bug, whole bucket removed if delete first element in bucket


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  bug, releaseTableObject called twice
ndb/src/ndbapi/NdbLinHash.hpp:
  bug, whole bucket removed if delete first element in bucket

  Logging to logging@openlogging.org accepted
sql_show.cc, type_enum.test, type_enum.result:
  Bug #5628 German characters in field-defs will be '?' with some table definitions


mysql-test/r/type_enum.result:
  Bug #5628 German characters in field-defs will be '?' with some table definitions
mysql-test/t/type_enum.test:
  Bug #5628 German characters in field-defs will be '?' with some table definitions
sql/sql_show.cc:
  Bug #5628 German characters in field-defs will be '?' with some table definitions
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysql-test/r/ps.result:
  Test results fixed: the test case for bug#5688 "Upgraded 4.1.5 Server 
  seg faults"
mysql-test/t/ps.test:
  Test case for bug#5688 "Upgraded 4.1.5 Server seg faults"
sql/item_cmpfunc.cc:
  A fix for bug#5688 "Upgraded 4.1.5 Server seg faults":
  fix just another place where we use wrong memory root for an Item
  in statement prepare.
  In addition, make the check for charsets in Item_bool_func2
  more generic (fixes the test case when we use LIKE to compare BLOBs
  with TEXT data).

into mysql.com:/home/dlenev/src/mysql-4.1-memroot

into deer.(none):/home/hf/work/mysql-4.1.5371

we do not increment rli->group_master_log_pos if we are just after a SET ONE_SHOT (it's not a standalone event)


mysql-test/r/rpl_charset.result:
  testing interruption of slave SQL thread between SET CHARACTER_SET_SERVER... and the companion INSERT.
mysql-test/t/rpl_charset.test:
  testing interruption of slave SQL thread between SET CHARACTER_SET_SERVER... and the companion INSERT.
sql/log_event.cc:
  we do not increment rli->group_master_log_pos if we are just after a SET
  ONE_SHOT, because SET ONE_SHOT should not be separated from its following
  updating query.

into deer.(none):/home/hf/work/mysql-4.1.5371

into mysql.com:/home/dlenev/src/mysql-4.1-memroot


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

with memory roots in THD/Statement/Item_arena.
Added assertions preventing memory allocation on bzero'ed MEM_ROOT since it is worked by 
pure luck and was very ineffective.


include/my_sys.h:
  Reimplementation of Monty's optimization of clear_alloc_root().
  Now clear_alloc_root() can be used only for detaching memory associated with MEM_ROOT
  (e.g. to avoid its freeing). It can not be used for MEM_ROOT initialization any longer 
  (it was bad idea anyway since memory allocation on such MEM_ROOT was very ineffective 
  and worked by pure luck).
  Introduced ALLOC_ROOT_MIN_BLOCK_SIZE constant.
mysys/my_alloc.c:
  Added description of init_alloc_root().
  Added assertions to alloc_root() and reset_root_defaults() so now they can only be used
  on previosly initialized MEM_ROOT. (It worked for bzeroed MEM_ROOT before but 
  by pure luck and very inefficiently). Calling free_root() on bzero'ed MEM_ROOT
  is still ok (we can't remove this easily because of static MEM_ROOTs).
  Also now using ALLOC_ROOT_MIN_BLOCK_SIZE constant inside these functions.
sql/opt_range.cc:
  Fixed get_quick_select_for_ref() function to not use bzero'ed MEM_ROOT for allocation.
  Also QUICK_RANGEs created in this function should be created in memory root of QUICK_SELECT.
sql/sql_class.cc:
  Implementation of Monty's idea about clear_alloc_root() optimization and cleanup of work 
  with memory roots in THD/Statement/Item_arena.
  Now we are always initing THD::transaction.mem_root and THD::mem_root in THD constructor 
  (without memory allocation and with minimal block size) and then later change their
  parameters in THD::init_for_queries() (this is partially because we can't allocate anything
  on bzero'ed memory roots anymore).
  Item_arena() constructor is now trivial and is used only then Item_arena is created as backup
  storage for other Item_arena (we use Item_arena(bool) now if it is part of Statement).
  Both trivial Item_arena constructor and destructor are now inline.
  Removed unneeded clear_alloc_root from Item_arena::restore_backup_item_arena().
sql/sql_class.h:
  Both trivial Item_arena constructor and destructor are now inline.
  Commented various Item_arena constructors.

Check index version already in master
to prevent "non-atmoic" failing drop index


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Check index version already in master
  to prevent "non-atmoic" failing drop index

CREATE TABLE t1 SELECT POINT(1,2); fixed


mysql-test/r/gis.result:
  Appropriate test result
mysql-test/t/gis.test:
  test case
sql/item_geofunc.cc:
  Item_geometry_func::fix_lengths_and_dec implementation
  several fix_length_and_dec's not needed now
sql/item_geofunc.h:
  Item_geometry_func class presented

into mysql.com:/home/jonas/src/mysql-4.1-ndb

prepared statements."


include/hash.h:
  New declaration for hash_reset() function. The old version was not used.
libmysql/client_settings.h:
  Declaration for mysql_detach_stmt_list().
libmysql/libmysql.c:
  Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
  add call to mysql_detach_stmt_list(prepared statements) to
  mysql_change_user(): all statements are freed by server, so client
  counterparts need to be marked as not usable.
mysys/hash.c:
  Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
  implementation of hash_reset(), which frees all hash elements
  and prepares the hash for reuse.
sql-common/client.c:
  Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
  implementation of mysql_detach_stmt_list(): zero connection pointer
  in given statement list, thus marking given statements as not usable.
sql/sql_class.cc:
  Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
  reset prepared statements map in THD::change_user().
sql/sql_class.h:
  Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
  implementation of Statement_map::reset().
  A little cleanup of ~Statement_map(): first empty names_hash, as st_hash
  has a free function, which will delete statements.
tests/client_test.c:
  A test case for bug #5315 "mysql_change_user() doesn't free prepared
  statements".

starting to restore

testBasic LocksAndInserts


ndb/test/src/HugoTransactions.cpp:
  Fix HugoTransaction::load so that transaction is closed and started if
  error is found

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge

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

into mysql.com:/home/jonas/src/mysql-4.1-ndb

  are undo-logged in correct order

Add bunch of testcases to autotest


ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Send fragrecord ptr to initOpConnection so that is does not
  have to look it up every time (if needed)
  
  Make operation list on fragment fifo so that uncommitted operations
    are undo-logged in correct order
ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Send fragptr to initOpConnection
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  dllist -> dlfifolist
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  dllist -> dlfifolist
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Make operation list on fragment fifo so that uncommitted operations
    are undo-logged in correct order
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Fix uninitialized variable c_start.m_startTime
    which made startPartial and startPartitioned fail
ndb/test/ndbapi/testSystemRestart.cpp:
  Added testSystemRestart -n SR9 which
    demonstrates that two prepared operation on same
    records _used to_ be undo-logged in wrong order makeing
    system restart fail
ndb/test/run-test/daily-devel-tests.txt:
  Add
  * testSystemRestart -n SR6
    Restart while some nodes have fs and other not
  * testSystemRestart -n SR7
    Restart in partition win
  * testSystemRestart -n SR8
    Restart in partition win, others starting during restart
  * testSystemRestart -n SR9
    Multiple ops on same record prepared before

BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  SCCS merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged

into private-client-ip-101.oz.net:/Users/brian/mysql/mysql-4.1


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

into mysql.com:/home/jonas/src/mysql-4.1-ndb

allow blank lines in Ndb.cfg files

   label for now)
 - tagged ChangeSet 1.2015.1.10 as "mysql-4.1.5"


configure.in:
   - Bumped up version number: 4.1.5 -> 4.1.6 (still keeping the "gamma"
     label for now)

remove -e from atrt-mysql-test-run

OPTIMIZE TABLE <archive table>

This recompresses the table, thus removing any additional gzip headers caused by opening/closing or flushing the table.


mysql-test/r/archive.result:
  Added optimize test case for archive engine.
mysql-test/t/archive.test:
  Added test case for OPTIMIZE table <archive table>
sql/examples/ha_archive.cc:
  The big change was the addition of optimize() call to allow tables to be recompressed (so if you have been reading/writing/reading/writing and ending up with larger files then you should, this will solve it). Though adding this feature is going to make it a real headache to add row level locking. 
  Also fixed bug reported by JD where storage engine code was not functioning (this of course was because I didn't check for the propper return value for hash_init). Removed BROKEN_GZIP ifdef since there was no way to enable it.
sql/examples/ha_archive.h:
  Added optimize() method.

into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1-ndb


BitKeeper/etc/logging_ok:
  auto-union