tables to INFORMATION_SCHEMA.


mysql-test/r/mysqlshow.result:
  WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
   tables to INFORMATION_SCHEMA.
   Fixed test cases result (changes are due to addition of new tables).

 tables to INFORMATION_SCHEMA.


mysql-test/r/information_schema.result:
  WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
   tables to INFORMATION_SCHEMA.
   Fixed test cases result (changes are due to the new tables added).
mysql-test/r/information_schema_db.result:
  WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
   tables to INFORMATION_SCHEMA.
   Fixed test cases result (changes are due to the new tables added).
mysql-test/r/status.result:
  WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
   tables to INFORMATION_SCHEMA.
   Fixed results for added testcases.
mysql-test/r/variables.result:
  WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
   tables to INFORMATION_SCHEMA.
   Fixed results for added test cases.
mysql-test/t/status.test:
  WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
   tables to INFORMATION_SCHEMA.
   Added test cases.
mysql-test/t/variables.test:
  WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
   tables to INFORMATION_SCHEMA.
   Added test cases.
sql/sql_show.cc:
  WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
   tables to INFORMATION_SCHEMA.
   Implementation of the new I_S tables.
   Also, show_status_array(): argument 'ucase_names' is added (true means that
   all variable names are to be converted to upper case).
sql/table.h:
  WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
   tables to INFORMATION_SCHEMA.
   Implementation of the new I_S tables.

(as part of the auto_increment cleanup of WL#3146; let's not be
sad, that monster push still removed serious bugs):
one problem with INSERT DELAYED (unexpected interval releases),
one with stored functions (wrong auto_inc binlogging).
These bugs were not released.


mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
      more tests of binlogging of INSERT DELAYED: with multi-row INSERTs.
      I identified why sleeps are needed to get a repeatable row-based
      binlogged: because without sleeps rows sometimes get groupped
      and so generate different row based events.
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  don't forget to drop tables on slave too, otherwise it leaves
  an orphan innodb table leading to rpl_insert_id failing sometimes
  (like in pushbuild "sapsrv2 -max").
mysql-test/extra/rpl_tests/rpl_insert_id.test:
      testing that if some statement does not update any row, it does
      not pollute the auto_inc binlog variables of the next statement;
      the test has to use stored procedures because with plain statements,
      mysql_reset_thd_for_next_command() does the resetting (and thus
      there is no problem); mysql_reset_thd_for_next_command() is not
      called inside routines.
mysql-test/r/binlog_row_binlog.result:
  result additions
mysql-test/r/binlog_statement_insert_delayed.result:
  result additions
mysql-test/r/binlog_stm_binlog.result:
  result additions
mysql-test/r/rpl_insert_id.result:
  result additions
mysql-test/r/rpl_loaddata.result:
      With the change to log.cc reverted, the result changes and is better:
      the change to log.cc had caused some INSERT_ID events to disappear
      though they were necessary (but testsuite could not catch that because
      it's single-threaded).
mysql-test/r/rpl_ndb_insert_ignore.result:
  NDB is now like other engines regarding INSERT IGNORE: autoincrement
  values which caused a duplicate key are re-used for next row, not lost.
  rpl_ndb_insert_ignore.result is now identical to rpl_insert_ignore.result.
sql/log.cc:
      LOAD DATA INFILE is binlogged as several events, and the last of them must
      have the auto_inc id. So it's wrong to reset the auto_inc id after every
      binlog write (because then it's lost after the first event of LOAD
      DATA INFILE and so missing for the last one)/
      Another problem: MYSQL_LOG::write() is not always called (for example
      if no row was updated), so we were missing reset in some cases.
sql/sp_head.cc:
      SELECT func1(),func2() generates two binlog events, so needs to
      clear auto_increment binlog variables after each binlog event
      (it would be more natural to clear them in the log write code,
      but LOAD DATA INFILE would suffer from this see the cset comment
      for log.cc). Without the clearing, the problem is:
      > exec func1()
      >> call cleanup_after_query() (which does not clear our vars here)
      >> binlog SELECT func1()
      <
      > exec func2()
      and so SELECT func2() is binlogged with the auto_inc of SELECT func1().
sql/sql_class.cc:
      after every statement we should clear auto_inc variables used for
      binlogging, except if this was a function/trigger (in which case
      it may be "INSERT SELECT func()", where the cleanup_after_query()
      executed in func() should not reset the auto_inc binlog variables
      as they'll be necessary when binlogging the INSERT SELECT later).
sql/sql_insert.cc:
      - as INSERT DELAYED uses the same TABLE object as the delayed_insert
      system thread, we should not call ha_release_auto_increment()
      from INSERT DELAYED (and btw it's logical as we reserve nothing
      as we don't perform the insert). Calling the function caused us to
      release values being used by the delayed_insert thread.
      So I do the call only if this is a non-DELAYED INSERT.
      - Assuming two INSERT DELAYED which get grouped by the delayed_insert
      thread, the second may use values reserved by the first, which is ok
      per se, but is a problem in statement-based binlogging:
      the 2nd INSERT gets binlogged with the "interval start" value
      of the first INSERT (=> duplicate error in slave).
      - no reason to ha_release_auto_increment() after every inserted row
      in INSERT SELECT; more efficient to do it only when the statement ends
sql/sql_parse.cc:
  a comment

sql/sql_yacc.yy:
  Manual merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


sql/sql_yacc.yy:
  Auto merged
client/mysqldump.c:
  Manual merge (rpl 5.0 -> rpl 5.1)
mysql-test/r/mysqldump.result:
  Manual merge (rpl 5.0 -> rpl 5.1)
mysql-test/t/mysqldump.test:
  Manual merge (rpl 5.0 -> rpl 5.1)

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/sql_yacc.yy:
  Manual merge (rpl 4.1 -> rpl 5.0)

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


BitKeeper/deleted/.del-rpl_heap.test:
  Auto merged
Makefile.am:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/r/binlog_stm_binlog.result:
  Auto merged
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
unittest/README.txt:
  Auto merged
unittest/unit.pl:
  Auto merged
mysql-test/t/disabled.def:
  Merge (main -> rpl 5.1)

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge (main -> rpl 5.0)
mysql-test/t/mysqldump.test:
  Manual merge (main -> rpl 5.0)

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl

Adding files to CMakeLists.txt


sql/CMakeLists.txt:
  Adding rpl_utility.cc

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

into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl

into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl


sql/log_event.cc:
  Auto merged

sql/log_event.cc:
  Adding cast since byte is unsigned char on Windows
sql/rpl_utility.cc:
  Adding missing return statement.

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.

15 seconds to less than a second.
The sleeps used to be necessary but not anymore as NDB has been fixed
wrt sync_slave_with_master.


mysql-test/include/rpl_multi_engine3.inc:
  Sleeps are not necessary anymore
  because NDB has been fixed wrt sync_slave_with_master.

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)

into  romeo.(none):/home/bk/b17620-mysql-5.1-new-rpl


sql/log_event.cc:
  Auto merged

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


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

Invalidating query cache when processing rows for a statement on the slave.


mysql-test/r/rpl_row_basic_11bugs.result:
  Result file change
mysql-test/t/rpl_row_basic_11bugs.test:
  Adding test to trigger failure
sql/log_event.cc:
  Adding code to invalidate the query cache just after opening the tables
  for processing the rows of one statement.

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

into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl

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


sql/sql_class.h:
  Auto merged

    merge to 5.1 - yet another merge fix


sql/log.cc:
  yet another merge fix

  merge to 5.1


sql/log.h:
  merge to 5.1

into  perch.ndb.mysql.com:/home/jonas/src/51-work


sql/log.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_class.h:
  merge

into  perch.ndb.mysql.com:/home/jonas/src/50-work


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  merge

  fix deadlock if master switches log file in parallell with "show master logs"
  


sql/log.cc:
  add raw_get_current_log which dont take log mutex
sql/sql_class.h:
  add raw_get_current_log which dont take log mutex
sql/sql_repl.cc:
  Fix lock order i.e first log_lock then index_lock