SF/Triggers in SBR mode."
BUG#14914 "SP: Uses of session variables in routines are not always replicated"
BUG#25167 "Dupl. usage of user-variables in trigger/function is not replicated
          correctly"

User-defined variables used inside of stored functions/triggers in
statements which did not update tables directly were not replicated.
We also had problems with replication of user-defined variables which
were used in triggers (or stored functions called from table-updating
statements) more than once.

This patch addresses the first issue by enabling logging of all
references to user-defined variables in triggers/stored functions
and not only references from table-updating statements.

The second issue stemmed from the fact that for user-defined
variables used from triggers or stored functions called from
table-updating statements we were writing binlog events for each
reference instead of only one event for the first reference.
This problem is already solved for stored functions called from
non-updating statements with help of "event unioning" mechanism.
So the patch simply extends this mechanism to the case affected.
It also fixes small problem in this mechanism which caused wrong
logging of references to user-variables in cases when non-updating
statement called several stored functions which used the same
variable and some of these function calls were omitted from binlog
as they were not updating any tables.



mysql-test/r/rpl_user_variables.result:
  BUG#20141 - User-defined variables are not replicated properly for 
              SF/Triggers in SBR mode.
  This patch adds the correct results for execution of the added test 
  procedures to the rpl_user_variables test.
mysql-test/t/rpl_user_variables.test:
  BUG#20141 - User-defined variables are not replicated properly for 
              SF/Triggers in SBR mode.
  This patch adds additional tests to the rpl_user_variables test that test 
  many of the different ways user-defined variables can be required to be 
  replicated.
sql/item_func.cc:
  BUG#20141 - User-defined variables are not replicated properly for SF/Triggers
              in SBR mode.
  To properly log accesses to user-defined variables from stored 
  functions/triggers, the get_var_with_binlog() method needs to log references 
  to such variables even from non-table-updating statements within them.
sql/log.cc:
  BUG#20141 - User-defined variables are not replicated properly for SF/Triggers 
              in SBR mode.
  This patch modifies the start_union_events method to accept the query id from 
  a parameter. This allows callers to set the query_id to the id of the sub 
  statement such as a trigger or stored function. Which permits the code to 
  identify when a user defined variable has been used by the statement and this 
  already present in THD::user_var_event.
  
  Note:
  The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the 
  proper replication of access to user-defined variables under a special test 
  case (the last case shown in rpl_user_variables.test).
sql/log.h:
  BUG#20141 - User-defined variables are not replicated properly for 
              SF/Triggers in SBR mode.
  This patch adds the query_id parameter to the calls to 
  mysql_bin_log.start_union_events().
sql/sp_head.cc:
  BUG#20141 - User-defined variables are not replicated properly for 
              SF/Triggers in SBR mode.
  This patch modifies the code to allow for cases where events for function calls
  have a separate union for each event and thus cannot use the query_id of the 
  caller as the start of the union. Thus, we use an artifically created query_id
  to set the start of the events.
  
  Note:
  The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the 
  proper replication of access to user-defined variables under a special test 
  case (the last case shown in rpl_user_variables.test).
sql/sql_class.cc:
  BUG#20141 - User-defined variables are not replicated properly for 
              SF/Triggers in SBR mode.
  This patch adds the query_id parameter to the calls to 
  mysql_bin_log.start_union_events().
  
  Note:
  The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow 
  the proper replication of access to user-defined variables under a special 
  test case (the last case shown in rpl_user_variables.test).

Post-merge fixes.


include/my_global.h:
  Post-merge fixes.
  Moving placement versions of operator new and operator delete to general
  server-wide header.
sql/slave.h:
  Post-merge fixes.
  Moving placement versions of operator new and operator delete to general
  server-wide header.
storage/ndb/include/ndb_global.h.in:
  Removing local definition of placement versions of
  operator new and operator delete.

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


sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged

1)
  BUG#25507 "multi-row insert delayed + auto increment causes
  duplicate key entries on slave" (two concurrrent connections doing
  multi-row INSERT DELAYED to insert into an auto_increment column,
  caused replication slave to stop with "duplicate key error" (and
  binlog was wrong), and BUG#26116 "If multi-row INSERT
  DELAYED has errors, statement-based binlogging breaks" (the binlog
  was not accounting for all rows inserted, or slave could stop).
  The fix is that: in statement-based binlogging, a multi-row INSERT
  DELAYED is silently converted to a non-delayed INSERT.
  This is supposed to not affect many 5.1 users as in 5.1, the default
  binlog format is "mixed", which does not have the bug (the bug is
  only with binlog_format=STATEMENT).
  We should document how the system delayed_insert thread decides of
  its binlog format (which is not modified by this patch):
  this decision is taken when the thread is created
  and holds until it is terminated (is not affected by any later change
  via SET GLOBAL BINLOG_FORMAT). It is also not affected by the binlog
  format of the connection which issues INSERT DELAYED (this binlog
  format does not affect how the row will be binlogged).
  If one wants to change the binlog format of its server with SET
  GLOBAL BINLOG_FORMAT, it should do FLUSH TABLES to be sure all
  delayed_insert threads terminate and thus new threads are created,
  taking into account the new format.
2)
  BUG#24432
  "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values".
  When in an INSERT ON DUPLICATE KEY UPDATE, using
  an autoincrement column, we inserted some autogenerated values and
  also updated some rows, some autogenerated values were not used
  (for example, even if 10 was the largest autoinc value in the table
  at the start of the statement, 12 could be the first autogenerated
  value inserted by the statement, instead of 11). One autogenerated
  value was lost per updated row. Led to exhausting the range of the
  autoincrement column faster.
  Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12.
  This bug breaks replication from a pre-5.0.24/pre-5.1.12 master.
  But the present bugfix, as it makes INSERT ON DUP KEY UPDATE
  behave like pre-5.0.24/pre-5.1.12, breaks replication from a
  [5.0.24,5.0.34]/[5.1.12,5.1.15]
  master to a fixed (5.0.36/5.1.16) slave! To warn users against this when
  they upgrade their slave, as agreed with the support team, we add
  code for a fixed slave to detect that it is connected to a buggy
  master in a situation (INSERT ON DUP KEY UPDATE into autoinc column)
  likely to break replication, in which case it cannot replicate so
  stops and prints a message to the slave's error log and to SHOW SLAVE
  STATUS.
  For 5.0.36->[5.0.24,5.0.34] replication or 5.1.16->[5.1.12,5.1.15]
  replication we cannot warn as master
  does not know the slave's version (but we always recommended to users
  to have slave at least as new as master).
  As agreed with support, I have asked for an alert to be put into
  the MySQL Network Monitoring and Advisory Service.
3) note that I'll re-enable rpl_insert_id as soon as 5.1-rpl gets
  the changes from the main 5.1.


BitKeeper/deleted/.del-rpl_insert_delayed.result:
  Delete: mysql-test/r/rpl_insert_delayed.result
mysql-test/extra/rpl_tests/rpl_insert_delayed.test:
  tests for BUG#25507 (lauch many concurrent INSERT DELAYED into an auto_inc
  column and see if they cause duplicates) and BUG#26116 (see if one error
  at first row on master makes the slave's data incorrect).
  It is then incorporated into a statement-based and mixed binlogging
  test, and into a row-based test.
  It is in fact mysql-test/t/rpl_insert_delayed.test from 5.0, renamed
  and extended to test BUG#25507.
mysql-test/extra/rpl_tests/rpl_insert_id.test:
  manual merge of test for BUG#24432
  "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
  from 5.0
mysql-test/r/rpl_insert_id.result:
  result update (it automerged from 5.0, contrary to the test file)
mysql-test/r/rpl_known_bugs_detection.result:
  result update (binlog event sizes differ from 5.0)
mysql-test/t/disabled.def:
  rpl_insert_id tests statement-based replication of INSERT ON
  DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is
  fixed in 5.1.16; we made the slave detect if it is connected to a
  <5.1.16 master and if so refuse to replicate.
  The problem is that this 5.1-rpl tree, even though it will produce
  the 5.1.16 release, still has a 5.1.15 version in configure.in.
  Thus rpl_insert_id fails. So I disable it. As soon as the 5.1-rpl
  tree gets the changesets from the main 5.1, its version will change
  to 5.1.16 and so I'll be able to re-enable the test.
mysql-test/t/rpl_known_bugs_detection.test:
  only in statement-based; row-based has no bug so test would fail.
sql/slave.cc:
  slave_print_msg(ERROR_LEVEL) calls my_error(ER_UNKNOWN_ERROR);
  so, for our my_printf_error(), which has a nicer message than this
  my_error(), to have any effect, it must be 
  called before slave_print_msg()
sql/sql_insert.cc:
  manual merge from 5.0 of a piece of the fixes for
  BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
  BUG#25507 "multi-row insert delayed + auto increment causes
  duplicate key entries on slave"
  BUG#26116 "If multi-row INSERT DELAYED has errors, statement-based
  binlogging breaks".
  The other pieces (e.g. log_event.cc) automerged from 5.0.
mysql-test/r/rpl_row_insert_delayed.result:
  result
mysql-test/r/rpl_stm_insert_delayed.result:
  result. Note how "mixed" and "statement" insert different data in
  the table.
mysql-test/t/rpl_row_insert_delayed.test:
  wrapper to test INSERT DELAYED binlogging in row-based mode
mysql-test/t/rpl_stm_insert_delayed.test:
  wrapper to test INSERT DELAYED binlogging in statement-based and mixed
  mode

into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-25507


mysql-test/r/rpl_insert_id.result:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  will merge by hand
sql/sql_insert.cc:
  will fix by hand

When opening/creating the transaction coordinator's log, if binlog is
used, the tc log is the binlog so we use the binlog's name; otherwise
we use the mmap-based log, named after the mandatory argument of the
--log-tc option (meant for that).


sql/log.cc:
  fixing wrong order of arguments to my_create()
  (3rd param is the desired modes of the file; "0" lead to no rights
  for anybody on the file).
sql/mysqld.cc:
  When opening/creating the transaction coordinator's log, if binlog is
  used, the tc log is the binlog so we use the binlog's name; otherwise
  we use the mmap-based log, named after the mandatory argument of the
  --log-tc option (meant for that).

duplicate key entries on slave" (two concurrrent connections doing
multi-row INSERT DELAYED to insert into an auto_increment column,
caused replication slave to stop with "duplicate key error" (and
binlog was wrong)), and BUG#26116 "If multi-row INSERT
DELAYED has errors, statement-based binlogging breaks" (the binlog
was not accounting for all rows inserted, or slave could stop).
The fix is that: if (statement-based) binlogging is on, a multi-row
INSERT DELAYED is silently converted to a non-delayed INSERT.
Note: it is not possible to test BUG#25507 in 5.0 (requires mysqlslap),
so it is tested only in the changeset for 5.1. However, BUG#26116
is tested here, and the fix for BUG#25507 is the same code change.


mysql-test/r/innodb-replace.result:
  result update
mysql-test/t/innodb-replace.test:
  now that multi-row delayed inserts are converted to normal inserts
  if the statement-based binlog is enabled,
  no error is issued even if this engine does not support INSERT DELAYED,
  as the insert does not go through the INSERT DELAYED code.
  To preserve the goal of this test, we change the statements to single-
  row inserts.
sql/sql_insert.cc:
  A multi-row INSERT DELAYED cannot be recorded to a statement-based
  binlog in a way that describes the insertions actually done;
  in that case we fallback to a non-delayed INSERT.
mysql-test/r/rpl_insert_delayed.result:
  result. Master and slave match.
mysql-test/t/rpl_insert_delayed.test:
  Test for BUG#26116 (see if one error at first row on master makes the
  slave's data incorrect, see if one error at second row on master
  makes slave stop).

into  gbichot3.local:/home/mysql_src/mysql-5.0-rpl-24432

"INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values".
When in an INSERT ON DUPLICATE KEY UPDATE, using
an autoincrement column, we inserted some autogenerated values and
also updated some rows, some autogenerated values were not used
(for example, even if 10 was the largest autoinc value in the table
at the start of the statement, 12 could be the first autogenerated
value inserted by the statement, instead of 11). One autogenerated
value was lost per updated row. Led to exhausting the range of the
autoincrement column faster.
Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12.
This bug breaks replication from a pre-5.0.24 master.
But the present bugfix, as it makes INSERT ON DUP KEY UPDATE
behave like pre-5.0.24, breaks replication from a [5.0.24,5.0.34]
master to a fixed (5.0.36) slave! To warn users against this when
they upgrade their slave, as agreed with the support team, we add
code for a fixed slave to detect that it is connected to a buggy
master in a situation (INSERT ON DUP KEY UPDATE into autoinc column)
likely to break replication, in which case it cannot replicate so
stops and prints a message to the slave's error log and to SHOW SLAVE
STATUS.
For 5.0.36->[5.0.24,5.0.34] replication we cannot warn as master
does not know the slave's version (but we always recommended to users
to have slave at least as new as master).
As agreed with support, I'll also ask for an alert to be put into
the MySQL Network Monitoring and Advisory Service.


mysql-test/r/rpl_insert_id.result:
  results to check the bugfix; without the bugfix, you would see, in
  master and slave:
  "3,2" instead of "2,2" for the INSERT VALUES testcase,
  "11,6,..." instead of "6,6,..." for the INSERT SELECT testcase.
mysql-test/t/rpl_insert_id.test:
  testing that BUG#24432 is fixed
sql/log_event.cc:
  A trick to force the master to pretend it is old and features BUG#24432.
  To do fast lookups in the list of known bugs by version, we compute
  the 3 X.Y.Z numbers from the master's version string and cache that
  into a new member Format_description_log_event::server_version_split.
  We do this computation in the event's two constructors.
  A simple prevention against buffer overrun when reading the master's
  version from a binlog event (assume the event is corrupted on disk,
  and so the version string on disk is longer than ST_SERVER_VER_LEN
  (50), then we would not get a closing 0 at the end of the class member.
sql/log_event.h:
  new member to hold the "split server version" (3 numbers X.Y.Z),
  and a method to compute this from the version string.
sql/slave.cc:
  a function which tells, based on master's version (as found
  in the Format_description event in the relay log being executed),
  if master can have a certain bug. This function uses a list of
  bug_id / first_version_with_bug / first_version_with_fix.
  If the test is positive, a short error message is put into SHOW SLAVE
  STATUS, and a verbose message is put into the slave's error log.
  The caller is expected to stop the slave in this case.
sql/slave.h:
  new function to test if the replication master has a bug
sql/sql_insert.cc:
  Fix for BUG#24432:t he reason was a misplaced restore_auto_increment() 
  (misplaced when fixing BUG#20188). Indeed, when updating the row,
  it is clear that the autogenerated auto_increment value will not be
  used for this row (and if by "chance" the autoinc value present
  in the updated row is >= to the not used autogenerated value,
  adjust_next_insert_id_after_explicit_value() will fix next_insert_id).
  We also add code for a fixed slave to detect that it is connected to
  a buggy master (in which case it cannot replicate so stops).
mysql-test/r/rpl_known_bugs_detection.result:
  see that SHOW SLAVE STATUS prints information that slave found a bug
  in master, and does not execute the dangerous event (table stays
  empty).
mysql-test/t/rpl_known_bugs_detection-master.opt:
  pass debug symbol to make the master pretend it has BUG#24432
mysql-test/t/rpl_known_bugs_detection.test:
  new test to see if bug detection by slave works

--binlog-format=row


mysql-test/r/binlog_row_ctype_cp932.result:
  Test result fix

into  mysql.com:/home/bar/mysql-5.1.b25815


sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
  Auto merged
sql/mysqld.cc:
  After merge fix

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


sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged

Since checking table compatibility before locking the table, there were
potential that a table could be locked that did not have a definition
that was compatible with the table on the slave.

This patch adds a check just after the table was locked to ensure that
the table is (still) compatible with the table on the slave.


sql/log.cc:
  Moving placement new operators to slave.h since they are used in
  several places in the replication code.
  Removing some compile warnings.
sql/log_event.cc:
  Moving code to check table compatibility to after tables are locked for
  writing.
sql/log_event.h:
  Doxygenifying comments.
  Copying error codes to Rows_log_event hierarchy since they are
  now used there as well.
sql/rpl_utility.h:
  Doxygenifying some comments.
  Changing class table_def to copy the column types given to it.
  Adding structure RPL_TABLE_LIST as a subclass of TABLE_LIST to represent
  lists of tables for the slave.
sql/slave.h:
  Adding placement new and delete operators since the slave uses them
  in several places.
sql/sql_insert.cc:
  Removing a compiler warning.

Problem: "Data truncated" warning was incorrectly generated
when storing a Japanese character encoded in utf8
into a cp932 column.
Reason: Incorrect wrong warning condition
compared the original length of the character in bytes
(which is 3 in utf8) to the converted length of the
character in bytes (which is 2 in cp932).
Fix: use "how many bytes were scanned from input" instead
of "how many bytes were put to the column" in the condition.


mysql-test/r/ctype_cp932.result:
  Adding test case
mysql-test/t/ctype_cp932.test:
  Adding test case
sql/field.cc:
  Change warning condition from:
  "if number of bytes written to destination is less than full source length"
  to
  "if number of bytes read from source is less than full source length"

into  mysql.com:/home/bar/mysql-5.1.b25081


mysql-test/r/show_check.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

Problem: The Table_type column of "SHOW FULL TABLES" displayed
"ERROR" instead of "BASE TABLE" for tables having non-ascii
characters in their names.
Reason: tablename to filename encoding was missing, so
mysql_frm_type() tried to open a wrong file name.

Fix: adding tablename to filename encoding


mysql-test/r/show_check.result:
  Adding test case
mysql-test/t/show_check.test:
  Adding test case
sql/sql_show.cc:
  Adding tablename to filename encoding.
  Removing variable "end" with is not used anymore.

into  mysql.com:/home/bar/mysql-5.1.b24747


mysql-test/r/xml.result:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged

into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_21490


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_21490


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

This patch deprecates the replication startup options in the configuration
file and on the command line. The options deprecated include:

MASTER_HOST, MASTER_USER, MASTER_PASSWORD, MASTER_PORT, MASTER_CONNECT_RETRY,
MASTER_SSL, MASTER_SSL_CA, MASTER_SSL_CAPATH, MASTER_SSL_CERT, MASTER_SSL_KEY,
and MASTER_SSL_CIPHER

The code is designed to print the warning message once.


sql/mysql_priv.h:
  BUG#21490 - No warning issued for deprecated replication parameters
  This patch modifies the WARN_DEPRECATED macro to permit displaying a deprecated 
  warning to the user at startup when the replication startup options are detected.
  It displays the same messae as the original version of the macro but allows the 
  macro to be called before a thread is created and the ER() macro is defined.

This patch deprecates the replication startup options in the configuration
file and on the command line. The options deprecated include:

MASTER_HOST, MASTER_USER, MASTER_PASSWORD, MASTER_PORT, MASTER_CONNECT_RETRY,
MASTER_SSL, MASTER_SSL_CA, MASTER_SSL_CAPATH, MASTER_SSL_CERT, MASTER_SSL_KEY,
and MASTER_SSL_CIPHER

The code is designed to print the warning message once.


sql/mysql_priv.h:
  BUG#21490 - No warning issued for deprecated replication parameters
  This patch modifies the WARN_DEPRECATED macro to permit displaying a deprecated 
  warning to the user at startup when the replication startup options are detected.
  It displays the same messae as the original version of the macro but allows the 
  macro to be called before a thread is created and the ER() macro is defined.

into  dsl-hkibras-fe36f900-97.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug16567_binlog_verbose_help_jeb


sql/mysqld.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_locale.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/log_event.cc:
  Manual merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


configure.in:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/mysqld.cc:
  Auto merged

sql/mysqld.cc:
  Once again, disable symlink.test under valgrind builds. symlink.test
  fails deep in mi_repair - the result of this having been disabled
  for almost 5 years.

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/sql_parse.cc:
  Use local.

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max


sql/sql_parse.cc:
  SCCS merged

by the patch for Bug#4968


sql/sql_parse.cc:
  Fix lowercase_tables2 test failure on powermacg5: table_case_name()
  function needed create_info.alias if lowercase_table_names=2, which
  was not set for the stack copy of HA_CREATE_INFO. Move the
  update of create_info.alias from create_table_precheck to 
  mysql_execute_command, so that it is done on the right object.

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/mysqld.cc:
  Auto merged
mysql-test/r/ps.result:
  SCCS merged
mysql-test/t/ps.test:
  Use local

mysql-test/r/ps.result:
  Update result files.
mysql-test/t/ps.test:
  Disable result ouptut of SHOW CREATE TABLE: DATA DIRECTORY option
  may be present or absent from the output depending on the build
  otpions and the operating system, so the output is not consistent
  across supported platforms.
sql/mysqld.cc:
  Remove a tricky #ifdef dependency of --use-symbolic-links on PURIFY
  added in 2002: DEBUG options should not influence server functionality.
  This backfired by producing different output of SHOW CREATE TABLE
  depending on the build options (see also Bug#25677 "With 
  --skip-symbolic-links option on, DATA DIRECTORY clause
  is silently ignored".

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/t/ps.test:
  Use local.
mysql-test/t/backup.test:
  SCCS merged

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


mysql-test/t/backup.test:
  Auto merged
mysql-test/t/ps.test:
  Manual merge.

mysql-test/t/backup.test:
  Backport a patch for sporadically failing myisam.test (and now ps.test)
  from 5.0. The cause was in backup.test not cleaning up tables in
  mysqltest-vardir/tmp after itself.
mysql-test/t/ps.test:
  Add additional protection against possible failure in the middle of
  backup.test

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/sql_select.cc:
  Auto merged

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/ha/ha0ha.c:
  Auto merged
storage/innobase/include/hash0hash.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged
configure.in:
  Use local
sql/sql_parse.cc:
  Use local
sql/sql_table.cc:
  Use local
mysql-test/t/ps.test:
  SCCS merged

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged