plugin_load.test created lines in the warnings files and made
pushbuild cells yellow. Some pushbuild systems are configured
so that they don't build the ha_example plugin. Trying to load
them creates error messages in the error log. These were copied
to the warnings file.

Fixed by ignoring expected error messages for non-existent
ha_example.


mysql-test/lib/mtr_report.pl:
  Bug#35559 - plugin_load.test creates warnings
  Ignore expected error messages for non-existent ha_example.

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/partition_not_windows.result:
  Auto merged
mysql-test/r/partition_symlink.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Auto merged
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/partition_symlink.test:
  Manual merge
mysql-test/t/symlink.test:
  Manual merge
sql/sql_parse.cc:
  Manual merge

into  stella.local:/home2/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg


configure.in:
  Manual merge

into  mysql.com:/home/svoj/devel/mysql/cov/mysql-5.1-engines


sql/log_event.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Have changed the DATA/INDEX dir to not be a database dir.
(and made some changes for better result files.)


mysql-test/suite/parts/inc/partition_basic_symlink.inc:
  Bug#35306: partition_basic_symlink test failures
  
  after bug 32167 it is not allowed with DATA/INDEX DIR in any database
  directory.
  
  remade the inc-files to make better use of each other (less duplicate tests)
mysql-test/suite/parts/inc/partition_directory.inc:
  Removed disable/enable_query_log for better result files
mysql-test/suite/parts/inc/partition_layout_check1.inc:
  changed DATA/INDEX DIR
mysql-test/suite/parts/inc/partition_layout_check2.inc:
  added check with_directories
mysql-test/suite/parts/inc/partition_methods1.inc:
  Removed disable/enable_query_log for better result files
mysql-test/suite/parts/inc/partition_methods2.inc:
  Removed disable/enable_query_log for better result files
  Added with_directories for testing of DATA/INDEX DIR
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Updated test result due to test case changes
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Updated test result due to test case changes
mysql-test/suite/parts/r/partition_basic_symlink_innodb.result:
  Updated test result due to test case changes
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
  Updated test result due to test case changes
mysql-test/suite/parts/t/disabled.def:
  Bug#35306: parts.partition_basic_symlink test failures
  Enable the test again since the have been fixed
mysql-test/suite/parts/t/partition_basic_innodb.test:
  Added check for table files.
mysql-test/suite/parts/t/partition_basic_myisam.test:
  removing dependency of symlink
  (test exists now in parts.partition_basic_symlink_myisam)
mysql-test/suite/parts/t/partition_basic_symlink_innodb.test:
  Bug#35306: partition_basic_symlink test failures
  
  Removed old test (since DATA/INDEX DIRECTORY is not supported in InnoDB)
  and replaced it with a simple test that altering a partitioned innodb
  with DATA/INDEX DIR to MyISAM, would use the DATA/INDEX DIR.

Updated the test due to bug 32167

Corrected spelling of error message


mysql-test/r/partition_not_windows.result:
  Updated test result due to test case changes and corrected spelling error
mysql-test/r/partition_symlink.result:
  Bug#35305: partition_symlink test failure
  
  Updated test result due to test case changes
mysql-test/r/symlink.result:
  Updated test result due to test case changes and corrected spelling error
mysql-test/t/disabled.def:
  Bug#35305: partition_symlink test failure
  
  Enable the test after it has been fixed
mysql-test/t/partition_not_windows.test:
  Removed disable/enable_query_log for better result files
mysql-test/t/partition_symlink.test:
  Bug#35305: partition_symlink test failure
  
  Changes due to bug 32167
mysql-test/t/symlink.test:
  using replace_result instead of disable_query_log
sql/partition_info.cc:
  corrected spelling
sql/sql_parse.cc:
  corrected spelling

into -engines tree.

hander::table_share was not updated after changing table->s.


sql/ha_partition.cc:
  Valgrind warning after merge -main -> -engines, after bug#32943
  
  change_table_ptr can happen in a middle of
  alter table rename/drop/... partition
  
  the newly created partitions must get the updated table_share too.
sql/sql_base.cc:
  Bug#32943 was missing a call to change_table_ptr, this was found by valgrind
  after a merge from -main to -engines.

into  stella.local:/home2/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_not_windows.result:
  Auto merged
mysql-test/r/partition_symlink.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/suite/parts/inc/partition_basic.inc:
  Auto merged
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Auto merged
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_create_table.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
mysql-test/t/partition_symlink.test:
  Manual merge

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  stella.local:/home2/mydev/mysql-5.0-axmrg


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

mysql-test/t/disabled.def:
  make pushbuild green, entry added to wrong disabled.def file.

mysql-test/r/partition_not_windows.result:
  fix results from merge
mysql-test/t/disabled.def:
  disable test partition_symlink

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1


sql/sql_yacc.yy:
  Auto merged

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0


sql/sql_yacc.yy:
  Auto merged

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/type_set.result:
  Auto merged
mysql-test/t/type_set.test:
  Manual merge

After merge fix.

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
sql/sql_yacc.yy:
  Manual merge

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0

Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1


configure.in:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_symlink.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/symlink.result:
  manual merge
mysql-test/suite/parts/inc/partition_basic.inc:
  manual merge
mysql-test/suite/parts/r/partition_basic_innodb.result:
  manual merge
mysql-test/suite/parts/r/partition_basic_myisam.result:
  manual merge
mysql-test/t/partition_symlink.test:
  manual merge
mysql-test/t/symlink.test:
  manual merge
sql/sql_parse.cc:
  manual merge

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

into  stella.local:/home2/mydev/mysql-5.0-axmrg


sql/sql_yacc.yy:
  Auto merged

into  stella.local:/home2/mydev/mysql-5.0-axmrg

mysql-test/r/partition_not_windows.result:
  Post-merge fixes
  New warnings
mysql-test/r/symlink.result:
  Post-merge fixes
  Typo
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Post-merge fixes
  Defeated creation of a warnings file.
mysql-test/t/partition_symlink.test:
  Post-merge fixes
  Fixed directory to an allowed one.
mysql-test/t/type_set.test:
  Post-merge fixes
  Defeated creation of a warnings file.

into  mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.1-engines


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
sql/sql_yacc.yy:
  After merge fix.

into  mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.0-engines

When there are no underlying tables specified for a merge table,
SHOW CREATE TABLE outputs a statement that cannot be executed. The
same is true for mysqldump (it generates dumps that cannot be
executed).

This happens because SQL parser does not accept empty UNION() clause.

This patch changes the following:
- it is now possible to execute CREATE/ALTER statement with
  empty UNION() clause.
- the same as above, but still worth noting: it is now possible to
  remove underlying tables mapping using ALTER TABLE ... UNION=().
- SHOW CREATE TABLE does not output UNION() clause if there are
  no underlying tables specified for a merge table. This makes
  mysqldump slightly smaller.


mysql-test/r/merge.result:
  A test case for BUG#28248.
mysql-test/t/merge.test:
  A test case for BUG#28248.
sql/ha_myisammrg.cc:
  Do not output UNION clause in SHOW CREATE TABLE, when there are
  no underlying tables defined.
sql/sql_yacc.yy:
  Make underlying table list for MERGE engine optional.
  
  As for MERGE engine empty underlying tables list is valid, it should
  be valid for the parser as well.
  
  This change is mostly needed to restore dumps made by earlier MySQL
  versions. Also with this fix it is possible to remove underlying
  tables mapping by using ALTER TABLE ... UNION=().

into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines


mysql-test/suite/rpl/r/rpl_dual_pos_advance.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
  SCCS merged

            log-slave-updates and circul repl

This is a test case fix for BUG#13861.


mysql-test/r/rpl_dual_pos_advance.result:
  Fix for a test case for BUG#13861.
mysql-test/t/rpl_dual_pos_advance.test:
  Fix for a test case for BUG#13861.
  
  master_pos_wait() requires slave sql thread running. But it is not
  guaranteed for this test case. As we use start slave until it may
  execute all events and shutdown before master_pos_wait() is started.
  
  On the other hand it is safe just to wait for slave to stop here,
  as start slave returns _after_ sql thread is started.

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
BitKeeper/deleted/.del-rpl_transaction.test:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Manual merge
mysql-test/t/query_cache.test:
  Manual merge

mysql-test/r/symlink.result:
  Post-merge fix
mysql-test/t/symlink.test:
  Post-merge fix