into  devsrv-b.mysql.com:/space/magnus/my51-bug15775_part2

into moonbone.local:/work/14583-bug-5.1-new-mysql


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged

mysql-test/t/ctype_ucs.test:
  Auto merged
sql/sql_update.cc:
  Auto merged
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged

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


sql/sql_acl.cc:
  Auto merged

 - Update patch for 5.0 
 - Added common function to be called when 'acl_users' has been modified


mysql-test/r/grant2.result:
  Use "create user" to avoid warnings about missing fields
mysql-test/t/grant2.test:
  Use "create user" to avoid warnings about missing fields
sql/sql_acl.cc:
  Add new function "rebuild_check_host" that is to be called when the 'acl_users'
  list has changed.
  Call function "rebuild_check_host" from mysql_drop_user, mysql_rename_user and acl_insert_user.
  Use "acl_user->host.hostname" as key when searching the acl_check_hosts in init_check_host.

into moonbone.local:/work/14583-bug-4.1-mysql

Manual merge.


Makefile.am:
  Added new 'plugin' subdir.
configure.in:
  Added plugin related makefiles.
include/my_base.h:
  Added HA_OPEN_FROM_SQL_LAYER flag - indicates that a table was openned from the sql layer.
  Added HA_OPTION_RELIES_ON_SQL_LAYER flag - indicates that a table relies on the sql layer.
  Added HA_CREATE_RELIES_ON_SQL_LAYER flag - indicates that a table must be created with
  HA_OPTION_RELIES_ON_SQL_LAYER flag.
include/myisam.h:
  Distinct fulltext parser number added.
include/plugin.h:
  Revise comment.
sql/ha_myisam.cc:
  Pass HA_OPEN_FROM_SQL_LAYER flag to mi_open().
  Pass HA_CREATE_RELIES_ON_SQL_LAYER flag to mi_create().
sql/sql_plugin.cc:
  Reuse "unused" dynamic array elements.
  A check for plugin info interface version.
sql/sql_plugin.h:
  Added plugin_type_names[] - string plugin type names.
sql/sql_show.cc:
  Use plugin_type_names array instead of switch to find literal parser name representation.
sql/sql_table.cc:
  Fixed that ALTER TABLE ... ADD INDEX loses WITH PARSER info.
storage/myisam/ft_boolean_search.c:
  Call fulltext parser init() function, pass MYSQL_FTPARSER_PARAM, returned by
  ftparser_call_initializer(), to parser->parse().
storage/myisam/ft_nlq_search.c:
  Call fulltext parser init() function, pass MYSQL_FTPARSER_PARAM, returned by
  ftparser_call_initializer(), to parser->parse().
storage/myisam/ft_parser.c:
  Added two functions:
  ftparser_call_initializer() - calls parser->init() function if specified and parser is not yet
  initialized. Returns MYSQL_FTPARSER_PARAM *.
  ftparser_call_deinitializer() - calls parser->deinit() function if specified and parser was
  initialized. Deinitializes all parsers.
  ft_parse() accepts additional param now - MYSQL_FTPARSER_PARM and passes it to parser->parse().
storage/myisam/ft_update.c:
  Call fulltext parser init() function, pass MYSQL_FTPARSER_PARAM, returned by
  ftparser_call_initializer(), to _mi_ft_parse().
  _mi_ft_parse() accepts additional param now - MYSQL_FTPARSER_PARAM and passes
  it to parser->parse().
storage/myisam/ftdefs.h:
  Prototypes for new functions were added. MYSQL_FTPARSER_PARAM was added
  to ft_parse and _mi_ft_parse().
storage/myisam/mi_close.c:
  Free ftparser_param allocated by ftparser_call_initializer().
storage/myisam/mi_create.c:
  If a table relies on the sql layer, set HA_OPTION_RELIES_ON_SQL_LAYER.
storage/myisam/mi_locking.c:
  Call deinitializer for each initialized parser.
storage/myisam/mi_open.c:
  Set default values for share->ftparser and keydef->ftparser_nr.
  If a table is openned from the non-sql layer and HA_OPTION_RELIES_ON_SQL_LAYER is set, raise
  HA_ERR_UNSUPPORTED error.
storage/myisam/myisamdef.h:
  Added number of distinct parsers to MYISAM_SHARE.
  Added ftparser_param to MI_INFO.
plugin/Makefile.am:
  New BitKeeper file ``plugin/Makefile.am''
plugin/fulltext/Makefile.am:
  New BitKeeper file ``plugin/fulltext/Makefile.am''
plugin/fulltext/plugin_example.c:
  New BitKeeper file ``plugin/fulltext/plugin_example.c''

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


mysql-test/r/grant2.result:
  Merge test results
mysql-test/t/grant2.test:
  Merge tests
sql/sql_acl.cc:
  Removing the 4.1 version patch

   - DROP USER command didn't reload the acl_check_hosts cache causing subsequent 
     connect's via TCP to fail randomly.
   - 4.1 version


mysql-test/r/grant2.result:
  Update test results
mysql-test/t/grant2.test:
  Add test for to check that connect via TCP work after "drop user"
sql/sql_acl.cc:
  Reload acl_check_hosts as its memory is mapped to acl_user
  Use acl_user->host.hostname when searching the acl_check_hosts list

into  mysql.com:/home/mydev/mysql-5.0-bug5390

storage/archive/azio.c:
  Build fixes for not having zutil.h
  
  use memset instead of zmemzero.
  
  use 8 as memory usage level (the default, which we were using anyway)
  
  in the .gz header, just say we're UNIX.
  
  use memcpy instead of zmemcpy.
storage/archive/azlib.h:
  don't use zutil.h, it's private to zlib

into  mysql.com:/home/stewart/Documents/MySQL/5.1/new


client/mysqltest.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
strings/decimal.c:
  Auto merged
configure.in:
  remove 5.0 version increement
sql/ha_archive.cc:
  merge
sql/handler.cc:
  merge
sql/mysqld.cc:
  merge

into  xiphis.org:/home/antony/work2/p4-bug15976

into  mysql.com:/home/mydev/mysql-5.0-bug5390

into  mysql.com:/space/pekka/ndb/version/my50

storage/ndb/test/ndbapi/test_event_merge.cpp:
  Rename: ndb/test/ndbapi/test_event_merge.cpp -> storage/ndb/test/ndbapi/test_event_merge.cpp
storage/ndb/test/ndbapi/Makefile.am:
  post-merge fix

into  mysql.com:/space/pekka/ndb/version/my51


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  merge-ul
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  merge-ul
storage/ndb/test/ndbapi/Makefile.am:
  merge-ul

When InnoDB compares varchar field in ucs2 with given key using bin collation,
it calls my_strnncollsp_ucs2_bin() to perform comparison.
Because field length was lesser than length of key field should be padded
with trailing spaces in order to get correct result. 
Because  my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
doesn't pads field, wrong comparison result was returned. This results in
wrong result set.

my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
but using binary collation.


mysql-test/t/ctype_ucs.test:
  Test case for bug#14583  Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping
  correct records.
mysql-test/r/ctype_ucs.result:
  Test case for bug#14583  Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping correct records.
strings/ctype-ucs2.c:
  Fix bug#14583 Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping
  correct records.my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
  but using binary collation.

ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  error code 4709 was set outside if()
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  fix opType for detached triggers (accidental miss since v21x?)
ndb/test/ndbapi/Makefile.am:
  test_event_merge v5.0
ndb/test/ndbapi/test_event_merge.cpp:
  test_event_merge v5.0

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  build fix for 5.0

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


client/mysql.cc:
  Auto merged
myisam/mi_delete.c:
  Auto merged
mysql-test/r/fulltext2.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  mysql.com:/home/mydev/mysql-4.1-bug5390


libmysqld/ha_blackhole.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.0-bug5390


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.1-bug5390

into  mysql.com:/home/mydev/mysql-5.1-bug5390


sql/sql_parse.cc:
  Auto merged

                                           


sql/sql_yacc.yy:
  Fix for SQLCOM_BINLOG_BASE64_EVENT related code.                                
  - added missing ';'                                                             
  - added binlog_base64_event

into  pylon.mylan:/home/psergey/mysql-5.1-26dec-merge

into  mysql.com:/home/psergey/mysql-5.1-26dec-merge

into  pylon.mylan:/home/psergey/mysql-5.1-26dec-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/handler.h:
  Merge

into  mysql.com:/home/mydev/mysql-5.1-bug5390


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/r/create.result:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
mysql-test/r/merge.result:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
mysql-test/t/merge.test:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/mysql_priv.h:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/sql_base.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/sql_delete.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/sql_insert.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/sql_load.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/sql_parse.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/sql_update.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1

into  mysql.com:/home/mydev/mysql-5.0-bug5390


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
mysql-test/r/create.result:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
mysql-test/r/merge.result:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
mysql-test/t/create.test:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
mysql-test/t/merge.test:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/mysql_priv.h:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/sql_parse.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/sql_update.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0

  added item_xmlfunc.cc


BitKeeper/etc/ignore:
  added item_xmlfunc.cc

  Delete: libmysqld/item_xmlfunc.cc


BitKeeper/deleted/.del-item_xmlfunc.cc~565ad32584ed96d4:
  Delete: libmysqld/item_xmlfunc.cc

adjust SEL_TREE::keys_map appropriately.

- Added more comments.
- Added a RANGE_OPT_PARAM::remove_jump_scans flag that disables construction of index_merge
  SEL_TREEs that represent unusable conditions like "key1part1<c1 OR key2part2<c2"
- make prune_partitions() function handle the case where range analysis produces a list of 
  index_merge trees (it turned out that this is possible, appropriate test case added).
- Other small fixes.


mysql-test/r/partition_pruning.result:
  WL#2985 "Partition Pruning": post-review fixes: more test cases
mysql-test/t/partition_pruning.test:
  WL#2985 "Partition Pruning": post-review fixes: more test cases
sql/opt_range.cc:
  WL#2985 "Partition Pruning": post-review fixes:
  - Added more comments.
  - Fix the debug printouts
  - Added a RANGE_OPT_PARAM::remove_jump_scans flag that disables construction of index_merge
    SEL_TREEs that represent unusable conditions like "key1part1<c1 OR key2part2<c2"
  - make prune_partitions() function handle the case where range analysis produces a list of 
    index_merge trees (it turned out that this is possible, appropriate test case added).
sql/sql_partition.cc:
  WL#2985 "Partition Pruning": post-review fixes: make requested edits in comments.
sql/table.h:
  WL#2985 "Partition Pruning": post-review fixes: added bool TABLE::no_partitions_used
  (this change was missed when making the original cset)

into  mysql.com:/home/my/mysql-5.1


client/mysqlslap.c:
  Auto merged