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


sql/mysqld.cc:
  Auto merged

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


configure.in:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310

into  neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310


sql/mysqld.cc:
  Auto merged

 - Add protection so that 'show_ssl_get_cipher_list' does not write after end of "buff"


sql/mysqld.cc:
  Add check to not write after the end of "buff" when listing the available ciphers

configure.in:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/r/query_cache_notembedded.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
sql/ha_innodb.cc:
  manual merge
sql/sql_insert.cc:
  manual merge

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310


BUILD/SETUP.sh:
  Auto merged

 - Update for 5.1
 - Add "have_dlopen"
 - Remove requirement to load udf's only in "opt_plugin_dir" 


include/my_global.h:
  Remove duplicate defines
mysql-test/include/have_udf.inc:
  Use "have_dlopen" to check if we "have udf"
mysql-test/r/have_udf.require:
  Use "have_dlopen" to check if we "have udf"
mysql-test/r/udf.result:
  Update for new error message "function"->"symbol"
sql/item_func.cc:
  Remove "evil" dbug printour that checks args[0] even if arg_count is 0
sql/mysql_priv.h:
  Add "have_dlopen"
sql/mysqld.cc:
  Add "have_dlopen"
  Move HAVE_DLOPEN defined to only surround "udf_free" and "udf_init"
sql/set_var.cc:
  Add "have_dlopen"
sql/sql_plugin.cc:
  Surround 'dlclose' with HAVE_DLOPEN
sql/sql_udf.cc:
  Remove the requirement to load udf's only from "opt_plugin_dir".
  Fix spelling error

into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754

into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_partition.cc:
  manual merge

Fixed result files


mysql-test/r/ndb_partition_key.result:
  Fixed result files
mysql-test/r/partition.result:
  Fixed result files

into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835

by previous push.

into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  manual merge
mysql-test/t/ndb_partition_key.test:
  manual merge

Added new syntax ALTER TABLE t1 REMOVE PARTITIONING,
changed semantics of ALTER TABLE t1 ENGINE=X; to not remove partitioning
Fix a number of mix engine bugs in partitioning


mysql-test/r/ndb_partition_key.result:
  Added a number of new test cases
mysql-test/r/partition.result:
  Added a number of new test cases
mysql-test/t/ndb_partition_key.test:
  Added a number of new test cases
mysql-test/t/partition.test:
  Added a number of new test cases
sql/lex.h:
  REMOVE and PARTITIONING added as keywords in parser
sql/sql_lex.h:
  Added flag to alter_info flag
sql/sql_partition.cc:
  Fixes for the new syntax, changes of the current semantics of the syntax.
  Fixes for errors in handling mixes of table handlers in partitioning syntax
  for ALTER TABLE
sql/sql_table.cc:
  Bug fix
sql/sql_yacc.yy:
  New syntax for REMOVE PARTITIONING

into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/Makefile.am:
  Merge
sql/share/errmsg.txt:
  Merge
sql/sql_udf.cc:
  Merge

configure.in:
  Don't look for "dlopen" if server linked with -static or -all-static flag

sql/sql_partition.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

  added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()


mysql-test/r/partition.result:
  Fix for bug#15336 Partitions: crash if create table as select
    test case
mysql-test/t/partition.test:
  Fix for bug#15336 Partitions: crash if create table as select
    test case

sql/sql_class.h:
  line #ifdef-ed

  use part_info->item_free_list instead of thd->free_list during partition function parsing


mysql-test/r/partition.result:
  Bug#14367 Partitions: crash if utf8 column
    test case
mysql-test/t/partition.test:
  Bug#14367 Partitions: crash if utf8 column
    test case
sql/item.cc:
  Bug#14367 Partitions: crash if utf8 column
    create copy of string in current mem_root to avoid memory leak

additional fixes


mysql-test/r/partition.result:
  result fixed
mysql-test/t/partition.test:
  testcase
sql/sql_parse.cc:
  part_info cloning moved here
sql/sql_partition.cc:
  fixes
sql/sql_table.cc:
  part_info cloning removed

into mysql.com:/home/hf/work/mysql-5.1.clean

  additional check for subselect


mysql-test/r/information_schema.result:
  Fix for bug#18224 VIEW on information_schema crashes the server
    test case
mysql-test/t/information_schema.test:
  Fix for bug#18224 VIEW on information_schema crashes the server
    test case

Crash happened when one selected data from one of INFORMATION_SCHEMA
tables and in order to build its contents server had to open view which
used stored function and table or view on which one had not global or
database-level privileges (e.g. had only table-level or had no
privileges at all).

The crash was caused by usage of check_grant() function, which assumes
that either number of tables to be inspected by it is limited explicitly
or table list used and thd->lex->query_tables_own_last value correspond
to each other (the latter should be either 0 or point to next_global
member of one of elements of this table list), in conditions when
above assumptions were not true. This fix just explicitly limits
number of tables to be inspected. Other negative effects which are
caused by the fact that thd->lex->query_tables_own_last might not
be set properly during processing of I_S tables are less disastrous
and will be reported and fixed separetely.



mysql-test/r/information_schema_db.result:
  Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"
    test case
mysql-test/t/information_schema_db.test:
  Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"
    test case
sql/sql_acl.cc:
    added note

sql/ha_ndbcluster.h:
  Fix HPUX compilation (copy-paste error I think).

into  mysql.com:/home/hartmut/projects/mysql/dev/5.1/gcc41

into  mysql.com:/home/bk/b17400-mysql-5.1-new

Fixing tests to get the test suite passing. This does not hide the bug
since it's a matter of performance, not correctness.


mysql-test/t/binlog_row_blackhole.test:
  Disabling ps-protocol for the test.
mysql-test/t/binlog_row_insert_select.test:
  Disabling ps-protocol for the test.
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  Disabling ps-protocol for the test.
mysql-test/t/rpl_row_create_table.test:
  Disabling ps-protocol for the test.
mysql-test/t/rpl_row_flsh_tbls.test:
  Disabling ps-protocol for the test.

into mysql.com:/home/hf/work/mysql-5.1.clean


sql/sql_partition.cc:
  Auto merged

added THD::work_part_info member where we now store modified
partition_info structure.
It allows no solve problem when different parts of the part_info get
into different mem_roots


sql/partition_info.cc:
  get_clone implementation
sql/partition_info.h:
  get_clone() declared
sql/sql_class.h:
  THD::work_part_info added
sql/sql_partition.cc:
  thd->work_part_info instead of lex->part_info
sql/sql_table.cc:
  thd->work_part_info instad of lex->part_info
sql/unireg.cc:
  thd->work_part_info instad of lex->part_info