into  siva.hindu.god:/usr/home/tim/m/bk/51


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/rpl_000015.result:
  Auto merged
mysql-test/r/rpl_change_master.result:
  Auto merged
mysql-test/r/rpl_err_ignoredtable.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_stm_log.result:
  Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_drop_db.test:
  Auto merged
mysql-test/t/rpl_err_ignoredtable.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_stm_log-master.opt:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge (use local)
mysql-test/r/create.result:
  SCCS merged
mysql-test/r/innodb_mysql.result:
  !bkm
  Manual merge (use local)
mysql-test/t/sp.test:
  Manual merge (use local)

Fixes:
- Bug #23368: crash during insert, table has foreign key pointing into other schema,permission


storage/innobase/dict/dict0dict.c:
  Applied InnoDB snapshot 5.1-ss927
  
  Revision r927:
  dict_print_info_on_foreign_key_in_create_format(): Use ut_print_name()
  instead of passing the wrong length to ut_print_namel().  (Bug #23368)
  
  ut_print_name(), ut_print_namel(): Document the special treatment of '/'.
  
  ut_print_namel(): Replace strchr() with memchr(), as the string might
  not be NUL-terminated.
storage/innobase/include/ut0ut.h:
  Applied InnoDB snapshot 5.1-ss927
  
  Revision r927:
  dict_print_info_on_foreign_key_in_create_format(): Use ut_print_name()
  instead of passing the wrong length to ut_print_namel().  (Bug #23368)
  
  ut_print_name(), ut_print_namel(): Document the special treatment of '/'.
  
  ut_print_namel(): Replace strchr() with memchr(), as the string might
  not be NUL-terminated.
storage/innobase/ut/ut0ut.c:
  Applied InnoDB snapshot 5.1-ss927
  
  Revision r927:
  dict_print_info_on_foreign_key_in_create_format(): Use ut_print_name()
  instead of passing the wrong length to ut_print_namel().  (Bug #23368)
  
  ut_print_name(), ut_print_namel(): Document the special treatment of '/'.
  
  ut_print_namel(): Replace strchr() with memchr(), as the string might
  not be NUL-terminated.

into  siva.hindu.god:/usr/home/tim/m/bk/51

into  siva.hindu.god:/usr/home/tim/m/bk/50

into  siva.hindu.god:/usr/home/tim/m/bk/inno/51


storage/innobase/handler/ha_innodb.cc:
  null merge (use local)

Fixes:
- Bug #18077: InnoDB uses full explicit table locks in stored FUNCTION


storage/innobase/btr/btr0btr.c:
  Apply InnoDB snapshot ss923
  
  Revision r919:
  btr_page_get_father_for_rec(): Remove bogus comment about removed dict_tree_t.
storage/innobase/dict/dict0dict.c:
  Apply InnoDB snapshot ss923
  
  Revision r892:
  Merge changes from MySQL AB.
  
  dict_col_copy_type_noninline(): Remove the return statement.
  Some compilers do not allow return expressions of void type.
  
  innobase_start_or_create_for_mysql(): Do not cap srv_max_threads to 1000
  on Windows.
  
  Makefile.am (EXTRA_DIST): Add plug.in
  
  
  Revision r897:
  dict_index_get_if_in_cache(): Enclose in #ifdef UNIV_DEBUG.
  Replace the search loop with a call to dict_index_find_on_id_low().
storage/innobase/handler/ha_innodb.cc:
  Apply InnoDB snapshot ss923
  
  Revision r887:
  storage/innobase/handler: Merge changes from MySQL AB:
  
  ChangeSet
    2006/09/30 18:44:42-07:00 brian@zim.(none) 
    Merge zim.(none):/home/brian/mysql/merge-5.1
    into  zim.(none):/home/brian/mysql/arch-5.1
  
  ChangeSet
    2006/09/30 12:49:46-07:00 brian@zim.(none) 
    This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
    Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call. 
  
  ChangeSet
    2006/09/29 17:19:02-07:00 brian@zim.(none) 
    This removes the passing of global hton to engine instance. 
  
  ChangeSet
    2006/09/28 13:22:56+02:00 gbichot@dl145h.mysql.com 
    Merge gbichot@bk-internal:/home/bk/mysql-5.1-arch
    into  dl145h.mysql.com:/users/gbichot/mysql-5.1-arch
  
  ChangeSet
    2006/09/28 13:19:43+02:00 gbichot@dl145h.mysql.com 
    In the handlerton, cursor creation function don't have an argument
    and so the engine calls current_thd to derive transaction information;
    instead we now pass THD to those functions, it looks more logical
    (it makes the implicit current_thd parameter more visible).
    Approved by Brian and Monty.
  
  ChangeSet
    2006/09/26 22:51:53-07:00 brian@zim.(none) 
    Merge zim.(none):/home/brian/mysql/merge-5.1
    into  zim.(none):/home/brian/mysql/arch-5.1
  
  
  Revision r895:
  Merge changes from MySQL AB, and remove two compilation warnings.
  
  ha_innodb.cc: innodb_mutex_show_status(): Add (ulong) casts to
  ulonglong expressions being passed to fprintf %lu.  The warnings
  were apparently introduced by MySQL AB developers.
  
  mysql_declare_plugin(innobase): Add PLUGIN_LICENSE_GPL.
  
  have_innodb.inc: Merge changes from MySQL AB.
  
  
  Revision r923:
  ha_innobase::store_lock(): When downgrading table locks, do not
  check thd->in_lock_tables but test if
  thd->lex->sql_command == SQLCOM_LOCK_TABLES
  instead.  Otherwise, stored functions will use table locks.  (Bug #18077)
  
  This patch is from Heikki.
storage/innobase/include/dict0dict.h:
  Apply InnoDB snapshot ss923
  
  Revision r897:
  dict_index_get_if_in_cache(): Enclose in #ifdef UNIV_DEBUG.
  Replace the search loop with a call to dict_index_find_on_id_low().
storage/innobase/include/mem0dbg.h:
  Apply InnoDB snapshot ss923
  
  Revision r901:
  Enclose some mem debug functions in #ifdef UNIV_DEBUG or #ifdef UNIV_MEM_DEBUG.
storage/innobase/include/mtr0mtr.h:
  Apply InnoDB snapshot ss923
  
  Revision r866:
  mtr_print(), mtr_memo_contains(): Disable unless #ifdef UNIV_DEBUG.
storage/innobase/include/mtr0mtr.ic:
  Apply InnoDB snapshot ss923
  
  Revision r866:
  mtr_print(), mtr_memo_contains(): Disable unless #ifdef UNIV_DEBUG.
storage/innobase/include/sync0rw.h:
  Apply InnoDB snapshot ss923
  
  Revision r907:
  Send all SHOW ENGINE INNODB STATUS information to the client also when
  UNIV_SYNC_DEBUG is defined.
  
  rw_lock_list_print_info(): Add parameter "file".
  
  mutex_list_print_info(): Add parameter "file".  Make the function static.
storage/innobase/include/sync0sync.h:
  Apply InnoDB snapshot ss923
  
  Revision r907:
  Send all SHOW ENGINE INNODB STATUS information to the client also when
  UNIV_SYNC_DEBUG is defined.
  
  rw_lock_list_print_info(): Add parameter "file".
  
  mutex_list_print_info(): Add parameter "file".  Make the function static.
storage/innobase/include/univ.i:
  Apply InnoDB snapshot ss923
  
  Revision r894:
  univ.i: Indent some of the directives, and remove conditions about Windows
  in the "#else" branch of "#if building on Windows".
storage/innobase/mem/mem0dbg.c:
  Apply InnoDB snapshot ss923
  
  Revision r901:
  Enclose some mem debug functions in #ifdef UNIV_DEBUG or #ifdef UNIV_MEM_DEBUG.
  
  
  Revision r902:
  mem0dbg.c: Enclose some more function definitions in #ifdef UNIV_MEM_DEBUG.
  The declarations were already enclosed in #ifdef UNIV_MEM_DEBUG.
storage/innobase/mem/mem0pool.c:
  Apply InnoDB snapshot ss923
  
  Revision r896:
  mem0pool.c: Remove obsolete comments about the dictionary cache being
  managed with an LRU algorithm.
storage/innobase/mtr/mtr0mtr.c:
  Apply InnoDB snapshot ss923
  
  Revision r866:
  mtr_print(), mtr_memo_contains(): Disable unless #ifdef UNIV_DEBUG.
storage/innobase/row/row0purge.c:
  Apply InnoDB snapshot ss923
  
  Revision r869:
  row_purge_parse_undo_rec(): Correct a faulty condition.  Luckily, this
  bug would only surface if the InnoDB SQL interpreter were used for
  updating fixed-length columns.  Currently (as the UPD_NODE_NO_SIZE_CHANGE
  flag is never set), cmpl_info can only be 0 or UPD_NODE_NO_ORD_CHANGE.
  Luckily, UPD_NODE_NO_ORD_CHANGE is 1, and the condition was simplified
  to !cmpl_info.
storage/innobase/sync/sync0rw.c:
  Apply InnoDB snapshot ss923
  
  Revision r907:
  Send all SHOW ENGINE INNODB STATUS information to the client also when
  UNIV_SYNC_DEBUG is defined.
  
  rw_lock_list_print_info(): Add parameter "file".
  
  mutex_list_print_info(): Add parameter "file".  Make the function static.
storage/innobase/sync/sync0sync.c:
  Apply InnoDB snapshot ss923
  
  Revision r907:
  Send all SHOW ENGINE INNODB STATUS information to the client also when
  UNIV_SYNC_DEBUG is defined.
  
  rw_lock_list_print_info(): Add parameter "file".
  
  mutex_list_print_info(): Add parameter "file".  Make the function static.

Fixes:
- Bug #18077: InnoDB uses full explicit table locks in stored FUNCTION


sql/ha_innodb.cc:
  Apply InnoDB snapshot ss923
  
  Revision r922:
  ha_innobase::store_lock(): When downgrading table locks, do not
  check thd->in_lock_tables but test if
  thd->lex->sql_command == SQLCOM_LOCK_TABLES
  instead.  Otherwise, stored functions will use table locks.  (Bug #18077)

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint

into  polly.local:/tmp/maint/bug23256/mysql-5.1-maint


sql/stacktrace.c:
  Auto merged

into  polly.local:/tmp/maint/bug23256/mysql-5.0-maint


sql/stacktrace.c:
  Auto merged

- compilation on the Alpha platform was broken because the Alpha-specific code was not updated after replacing the SIGRETURN_FRAME_COUNT constant with a variable

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


sql/sql_class.cc:
  Auto merged

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

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


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd


mysql-test/lib/mtr_misc.pl:
  Add function mtr_exe_maybe_exists
mysql-test/mysql-test-run.pl:
  Adapt to running from binary dist
  Add function mtr_exe_maybe_exists to look for binaries that is optional
  Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd

to a value wich is not our default

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


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

commands and go directly to result file processing


client/mysqltest.c:
  Add command "exit" to mysqltest
mysql-test/r/mysqltest.result:
  Add command "exit" to mysqltest
mysql-test/t/mysqltest.test:
  Add command "exit" to mysqltest

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


client/mysqldump.c:
  Auto merged
sql/sql_class.cc:
  Auto merged

into  example.com:/work/bug23379/my50-bug23379


sql/sql_class.cc:
  Auto merged

into  example.com:/work/bug23379/my41-bug23379


sql/sql_class.cc:
  Auto merged

into  example.com:/work/bug23379/my51-bug23379


sql/sql_class.cc:
  Auto merged

into  example.com:/work/bug23379/my50-bug23379


sql/sql_class.cc:
  Auto merged

  
The value taken to be shown in SHOW PROCESSLIST is not
initialized when THD is created and will be random for
unauthenticated connections.
  
To the documentor: Random value, instead of NULL, was shown,
in SHOW PROCESSLIST for still non-authenticated connections.


sql/sql_class.cc:
  Initialize time_after_lock.
  It is used from SHOW PROCESSLIST's code. If not initialized
  random value is shown for connected but still unauthenticated
  clients in the column Time.

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


client/mysqldump.c:
  Auto merged
mysql-test/include/have_lowercase0.inc:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/mysql_protocols.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_drop_db.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysys/my_read.c:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/r/rpl000015.result:
  C
mysql-test/r/rpl_log.result:
  ul
mysql-test/r/rpl_max_relay_size.result:
  ul
mysql-test/r/rpl_replicate_do.result:
  ul
mysql-test/t/rpl000015.test:
  ul

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

client/mysqldump.c:
  fflush stderr after printing of error message
mysql-test/include/have_lowercase0.inc:
  Remove extra ;
mysql-test/r/rpl000015.result:
  Update result
mysql-test/r/rpl_change_master.result:
  Update result
mysql-test/r/rpl_error_ignored_table.result:
  Update result
mysql-test/r/rpl_loaddata.result:
  Update result
mysql-test/r/rpl_log.result:
  Update result
mysql-test/r/rpl_max_relay_size.result:
  Update result
mysql-test/r/rpl_replicate_do.result:
  Update result
mysql-test/t/lowercase_table3.test:
  Backport from 5.0
mysql-test/t/mysql_protocols.test:
  Backport from 5.0
mysql-test/t/rpl000015.test:
  Backport from 5.0
mysql-test/t/rpl_change_master.test:
  Backport from 5.0
mysql-test/t/rpl_drop_db.test:
  Backport from 5.0
mysql-test/t/rpl_error_ignored_table.test:
  Backport from 5.0
mysql-test/t/rpl_loaddata.test:
  Backport from 5.0
mysql-test/t/rpl_log-master.opt:
  Use --force-restart command in master.opt to force a restart for this test case
mysql-test/t/rpl_log.test:
  Backport from 5.0
mysql-test/t/rpl_max_relay_size.test:
  Backport from 5.0
mysql-test/t/rpl_replicate_do.test:
  Backport from 5.0

into  example.com:/work/bug23379/my41-bug23379

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


client/mysqldump.c:
  Auto merged

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


client/mysqldump.c:
  Auto merged

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


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/r/create.result:
  Merge
mysql-test/t/create.test:
  Merge
mysql-test/t/view.test:
  Remove the disable_warnings part as engine=innodb has been removed

Change the ssl related variables to loose so they work also when the server is compiled without ssl 

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my51-bug19745


client/mysqldump.c:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/r/mysqldump.result:
  manual merge

The mysqldump command with both the --xml and --hex-blob options will output blob data encoded as hexBinary.  
The proper XML datatype is xs:hexBinary.  
The correct XML datatype is specified be setting the xsi_type attribute equal to xs:hexBinary for each encoded element.


client/mysqldump.c:
  Bug#19745: mysqldump --xml produces invalid xml
  - Moved hex-blob code to it's own function.
  - Rewrote print_xml_tag function to accept zero or more attribute/value
    pair(s) which are appended to a separate tag name.
  - --xml option respects the --hex-blob option by ouputting blob data in hex
    encoded format.  Each hex encoded field tag will also contain an xsi:type
    attribute with an xs:hexBinary value.
  - --extended-insert and --xml are mutually exclusive. Otherwise, the xml file
    will contain INSERT commands.
  - Minor comment cleanup.
mysql-test/r/mysqldump.result:
  Bug#19745: mysqldump --xml produces invalid xml
  -Added results.
mysql-test/t/mysqldump.test:
  Bug#19745: mysqldump --xml produces invalid xml
  -Added test.

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


tests/mysql_client_test.c:
  Auto merged
mysql-test/r/show_check.result:
  Merge 5.0->5.1

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

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

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


tests/mysql_client_test.c:
  Auto merged

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


tests/mysql_client_test.c:
  Auto merged