into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


mysql-test/r/ndb_dd_basic.result:
  Auto merged
mysql-test/r/ndb_dd_disk2memory.result:
  Auto merged
BitKeeper/deleted/.del-ndb_dd_advance.result:
  Auto merged
BitKeeper/deleted/.del-ndb_dd_advance2.result:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1

into  lamia.home:/home/timka/mysql/src/5.1-dbg


mysql-test/r/insert_select.result:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1

into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg/51


libmysqld/libmysqld.def:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
sql/log.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

The cause of the bug was an incomplete fix for bug 18080.
The problem was that setup_tables() unconditionally reset the
name resolution context to its 'tables' argument, which pointed
to the first table of an SQL statement.

The bug fix limits resetting of the name resolution context in
setup_tables() only in the cases when the context was not set
by earlier parser/optimizer phases.


mysql-test/r/insert_select.result:
  Test for BUG#21774.
mysql-test/t/insert_select.test:
  Test for BUG#21774.
sql/sql_base.cc:
  Do not reset the name resolution contect unconditionally.
  Instead set the context to 'tables' only if it was not
  set before calling setup_tables().
sql/sql_insert.cc:
  Added asserts to make sure that in the case of INSERT ... VALUES ...
  statements it is not necessary to reset the name resolution context
  to the first table, because there is only one table in the list of
  tables anyway. The actual code is not removed in order not to
  confuse it with the actual bug fix.
sql/sql_parse.cc:
  Removed unnecessary reset of the name resolution context.
  The context is anyway unconditionally reset in mysql_insert()
  and mysql_prepare_insert().

Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged

Bug #21378  Alter table from X storage engine to NDB could cause data loss: don't overwrite local tables when pushing out schema changes

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqldump.c:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql/share/errmsg.txt:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged

into  naruto.:C:/cpp/mysql-5.1-maint


storage/myisam/mi_locking.c:
  Auto merged

 - When an ALTER TABLE RENAME is performed on windows, the files are closed and their cached file 
   descriptors are marked invalid. Performing INSERT, UPDATE or SELECT on the associated merge
   table causes a server crash on windows. This patch adds a test for bad file descriptors when a 
   table attempts a lock. If a bad descriptor is found an error is thrown. An additional FLUSH TABLES
   will be necessary to further operate on the associated merge table.


myisam/mi_locking.c:
  This patch prevents the windows built to crash if the file is closed.
mysql-test/r/windows.result:
  Added test case for the windows built.
mysql-test/t/windows.test:
  Added test case for the windows built.

  Fixing failed merge


sql/log.cc:
  Fixing failed merge

More specifically, the scripts/Makefile isn't created and it doesn't
translate mysql_fix_privilege_tables ".sh" .  So, 
mysql-test/mysql-test-run.pl doesn't find the binary and substitutes 
/bin/false instead.  That obviously doesn't "fix" anything and the 
test fails because of it.


mysql-test/t/system_mysql_db_fix.test:
  Change stolen from the -win tree.

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20612


mysql-test/r/ndb_dd_basic.result:
  manual 1+1
mysql-test/t/ndb_dd_basic.test:
  manual 1+1

storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  allocate separate copy tuple for delete after insert or update in same tx, instead of sharing pointer to same copy tuple.  this is an easy fix independent of commit/abort order of operations
mysql-test/r/ndb_dd_basic.result:
  test INS-DEL via assert in disk data code
mysql-test/t/ndb_dd_basic.test:
  test INS-DEL via assert in disk data code

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-arch

mysql-test/t/crash_commit_before.test:
  Server need to be compiled with innodb support for this test case to suceed

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge

mysql-test/mysql-test-run.pl:
  Don't set LD_LIBRARY_PATH  to the ndb dirs if ndb support is not available

 - Add ifdefs in ha_innodb.cc so it's only compiled if we have selected to build mysqld with innodb.
   This is inline with how it's done in other handlers.


sql/ha_innodb.cc:
  Add ifdef for WITH_INNOBASE_STORAGE_ENGINE around all code in ha_innodb.cc so it's only included if we have defined --with-innodb to configure

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


configure.in:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_mgm.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

storage/archive/azio.c:
  Fixed warnings for windows
storage/federated/ha_federated.cc:
  Warning fixes for Windows
storage/innobase/CMakeLists.txt:
  Fixed includes for Windows

sql/handler.h:
  Adding Falcon

sql/CMakeLists.txt:
  Compile problem for Windoows
storage/innobase/handler/ha_innodb.cc:
  Removed some dead code (Marko approved)

Adding in a few more engines to the now defunct (but still used) handler enum's since its the only way to enable for partitioning. 


sql/handler.h:
  Extended to add in more DB types for partioning.

storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
  Fix trailing comma in enum.
storage/ndb/include/kernel/signaldata/CreateTable.hpp:
  Fix trailing comma in enum.
storage/ndb/tools/listTables.cpp:
  Fix trailing comma in enum.

into  zim.(none):/home/brian/mysql/merge-5.1

storage/innobase/handler/ha_innodb.h:
  Rename: sql/ha_innodb.h -> storage/innobase/handler/ha_innodb.h
libmysqld/Makefile.am:
  Removed Innodb specific mention
sql/Makefile.am:
  Updated to remove innodb
storage/innobase/CMakeLists.txt:
  Added include directory
storage/innobase/Makefile.am:
  Updated to add in handler
storage/innobase/handler/ha_innodb.cc:
  Adjusted include files, also disabled replication code which was not being used.
storage/innobase/plug.in:
  Added additional Makefile
storage/innobase/handler/Makefile.am:
  New BitKeeper file ``storage/innobase/handler/Makefile.am''

into  ymer.(none):/usr/local/mysql/mysql-5.1-ndb-pbsu


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

Temporary tables are not written to disk by DDL operations. This makes
DDL much faster (useful for tests), but tables are lost after system
restart.

New commit, since this feature will not be available in 5.1.


storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
  Add new error messages for temporary tables.
storage/ndb/include/kernel/signaldata/CreateTable.hpp:
  Add new error messages for temporary tables.
storage/ndb/include/kernel/signaldata/DiAddTab.hpp:
  Add parameter for making table temporary.
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Add parameter for making table temporary.
storage/ndb/include/kernel/signaldata/ListTables.hpp:
  Add parameter for making table temporary.
storage/ndb/include/ndb_constants.h:
  Add parameter for making table temporary.
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Add parameter for making table temporary.
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Add parameter for making table temporary.
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Implement temporary tables.
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Implement temporary tables.
storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
  Implement temporary tables.
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Implement temporary tables.
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Implement temporary tables.
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Implement temporary tables.
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Implement temporary tables.
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Implement temporary tables.
storage/ndb/src/ndbapi/ndberror.c:
  Add new error messages for temporary tables.
storage/ndb/tools/listTables.cpp:
  Add display of table and index temporary status.

fixed multiple and missing deinitializations, moved all
deinit/del code in one place

remove #define __attribute__(A) from plugin.h
increase API version because placeholders were added
more robust definition of min_plugin_interface_version


include/mysql/plugin.h:
  move #define __attribute__(A) out of plugin.h (not part of the API)
  increase API version because placeholders were added
plugin/fulltext/plugin_example.c:
  compilation failure on non-GCC compilers
sql/sql_plugin.cc:
  more robust definition of min_plugin_interface_version
  it should work even when we forget to update it