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

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  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.

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''

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

  Update of Dutch errmsg translations (not complete yet)
errmsg.h:
  Fixup of changed error message file path in comment
authors.h:
  Ego add.


include/errmsg.h:
  Fixup of changed error message file path in comment
sql/authors.h:
  Ego add.
sql/share/errmsg.txt:
  Update of Dutch errmsg translations (not complete yet)

mysql-test/t/partition_mgm.test:
  make partition_mgm test deterministic

into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913

into  maint1.mysql.com:/data/localhome/tsmith/bk/51

into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx


sql/mysqld.cc:
  SCCS merged
sql/stacktrace.c:
  Manual merge (use local)
sql/stacktrace.h:
  !
  Manual merge (use local)

into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx


sql/mysqld.cc:
  Manual merge
sql/stacktrace.c:
  Manual merge; undo trivial change to avoid automerge.
sql/stacktrace.h:
  Manual merge; undo trivial change which avoided automerge

into  rama.(none):/home/jimw/my/mysql-5.1-clean

Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up


sql/mysqld.cc:
  Fix OPT_MYISAM_STATS_METHOD case, bug #21054

sql/stacktrace.c:
  stacktrace dumps for amd64 (backport fix for bug 21250 to mysql-4.1)
sql/stacktrace.h:
  stacktrace dumps for amd64 (backport fix for bug 21250 to mysql-4.1)

dbug/dbug.c:
  Don't try to force DBUG on.
  
  Conditionally compile this file, as the headers we load may change the 
  value of DBUG_OFF /after/ we set it.

into  rama.(none):/home/jimw/my/mysql-5.1-clean


sql/sql_parse.cc:
  Auto merged

into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913

mysql-test/r/ctype_recoding.result:
  Case change in 5.1.
mysql-test/t/heap_btree.test:
  Fixes bad merge.
mysql-test/t/partition.test:
  Split terrible "ls" test into two parts so that the different sorting orders
  of sundry OSes don't affect the output.

into  zim.(none):/tmp/merge-5.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged

are not found


storage/myisam/mi_test_all.sh:
  need "./" before the executable names otherwise they are not found

into  gbichot3.local:/home/mysql_src/mysql-5.1-2

This bug report was two problems:
1) LAST_INSERT_ID() returns a value which does not exist in the table
2) the reporter would want it to return the autoinc id of the updated
row.
1) is a real bug, 2) is a feature request.
In July I implemented 2) in 5.1 (which automatically fixes 1).
This has not yet been documented or released, so is changeable.
Precisely, recently Paul and a user found an easy workaround to give
2), which works in 4.1-5.0-5.1. So I can revert my code for 2),
because it's not needed, that's what I do here;
we forget about 2) (we will document the workaround).
But when I revert my code for 2), 1) comes back. We solve 1) by saying
that if INSERT ON DUPLICATE KEY UPDATE updates a row, it's like a
regular UPDATE: LAST_INSERT_ID() should not be affected (instead of
returning a non-existent value).
So note: no behaviour change compared to the last released 5.1; just
a bugfix for 1).


mysql-test/r/innodb_mysql.result:
  result update
mysql-test/t/innodb_mysql.test:
      test for the new way to fix BUG#19243: that if INSERT ON DUPLICATE
      KEY UPDATE updates a row, SELECT LAST_INSERT_ID() is not affected.
      Test of the workaround for people who want SELECT LAST_INSERT_ID()
      to return the autoinc id of the updated row.
sql/sql_insert.cc:
  No need to change LAST_INSERT_ID() if INSERT ON DUPLICATE KEY UPDATE
  updates a row, there is a workaround to achieve this without changing
  code: just add "autoinc_col=LAST_INSERT_ID(autoinc_col)" to your
  ON DUPLICATE KEY UPDATE clause.
  Prevent LAST_INSERT_ID() to contain an inexistent value in this case:
  if the row is updated it should be like a regular UPDATE: don't
  affect LAST_INSERT_ID() (achieved by marking that we didn't generate
  an id for this row: insert_id_for_cur_row=0).

state_mask argument to plugin_foreach()


sql/sql_show.cc:
  state_mask argument to plugin_foreach()

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb