bzr push into mysql-5.5-next-mr branch (mikael:2914 to 2915) Bug#48161 Bug#48447

[Mikael Ronstrom]

 2915 Mikael Ronstrom	2009-11-06 [merge]
      Merge BUG#48161, BUG#48447

    modified:
      mysql-test/r/ctype_collate.result
      mysql-test/r/partition_column.result
      mysql-test/r/partition_innodb.result
      mysql-test/t/ctype_collate.test
      mysql-test/t/partition_column.test
      mysql-test/t/partition_innodb.test
      sql/opt_range.cc
 2914 Alexander Nozdrin	2009-11-05 [merge]
      Auto-merge from mysql-next-mr.

    removed:
      libmysql/manager.c
    added:
      mysql-test/include/bug38347.inc
      mysql-test/include/have_nodebug.inc
      mysql-test/r/drop-no_root.result
      mysql-test/r/drop_debug.result
      mysql-test/r/grant4.result
      mysql-test/r/have_nodebug.require
      mysql-test/r/join_optimizer.result
      mysql-test/r/lock_sync.result
      mysql-test/r/log_state_bug33693.result
      mysql-test/r/partition_column.result
      mysql-test/r/partition_column_prune.result
      mysql-test/r/partition_utf8.result
      mysql-test/r/query_cache_disabled.result
      mysql-test/r/sp-no-code.result
      mysql-test/t/drop-no_root.test
      mysql-test/t/drop_debug.test
      mysql-test/t/grant4.test
      mysql-test/t/join_optimizer.test
      mysql-test/t/lock_sync.test
      mysql-test/t/log_state_bug33693-master.opt
      mysql-test/t/log_state_bug33693.test
      mysql-test/t/partition_column.test
      mysql-test/t/partition_column_prune.test
      mysql-test/t/partition_utf8.test
      mysql-test/t/query_cache_disabled-master.opt
      mysql-test/t/query_cache_disabled.test
      mysql-test/t/sp-no-code.test
      sql/records.h
      sql/sql_prepare.h
    renamed:
      mysql-test/include/have_community_features.inc =>
mysql-test/include/have_profiling.inc
      mysql-test/r/have_community_features.require =>
mysql-test/r/have_profiling.require
    modified:
      .bzrignore
      BUILD/build_mccge.sh
      Makefile.am
      client/mysqldump.c
      client/mysqltest.cc
      config/ac-macros/dtrace.m4
      configure.in
      include/config-win.h
      include/errmsg.h
      include/hash.h
      include/my_base.h
      include/mysql.h
      include/mysql.h.pp
      include/mysql_com.h
      libmysql/CMakeLists.txt
      libmysql/Makefile.shared
      libmysql/client_settings.h
      libmysql/errmsg.c
      libmysql/libmysql.c
      libmysql/libmysql.def
      libmysqld/lib_sql.cc
      libmysqld/libmysqld.c
      libmysqld/libmysqld.def
      mysql-test/collections/default.experimental
      mysql-test/include/query_cache_sql_prepare.inc
      mysql-test/lib/mtr_cases.pm
      mysql-test/r/alter_table.result
      mysql-test/r/create.result
      mysql-test/r/ddl_i18n_koi8r.result
      mysql-test/r/ddl_i18n_utf8.result
      mysql-test/r/delayed.result
      mysql-test/r/drop.result
      mysql-test/r/events_1.result
      mysql-test/r/events_2.result
      mysql-test/r/events_bugs.result
      mysql-test/r/events_grant.result
      mysql-test/r/explain.result
      mysql-test/r/fulltext.result
      mysql-test/r/func_default.result
      mysql-test/r/func_math.result
      mysql-test/r/func_regexp.result
      mysql-test/r/func_sapdb.result
      mysql-test/r/func_str.result
      mysql-test/r/func_test.result
      mysql-test/r/func_time.result
      mysql-test/r/grant.result
      mysql-test/r/grant2.result
      mysql-test/r/having.result
      mysql-test/r/information_schema.result
      mysql-test/r/information_schema_db.result
      mysql-test/r/information_schema_inno.result
      mysql-test/r/information_schema_part.result
      mysql-test/r/innodb_mysql.result
      mysql-test/r/insert.result
      mysql-test/r/join.result
      mysql-test/r/locale.result
      mysql-test/r/log_state.result
      mysql-test/r/lowercase_table2.result
      mysql-test/r/merge.result
      mysql-test/r/mysqlcheck.result
      mysql-test/r/mysqldump.result
      mysql-test/r/outfile.result
      mysql-test/r/partition.result
      mysql-test/r/partition_datatype.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/partition_list.result
      mysql-test/r/partition_mgm_err.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/partition_range.result
      mysql-test/r/profiling.result
      mysql-test/r/ps.result
      mysql-test/r/ps_1general.result
      mysql-test/r/query_cache_ps_no_prot.result
      mysql-test/r/query_cache_ps_ps_prot.result
      mysql-test/r/select.result
      mysql-test/r/show_check.result
      mysql-test/r/signal_code.result
      mysql-test/r/sp-code.result
      mysql-test/r/sp-vars.result
      mysql-test/r/sp.result
      mysql-test/r/sp_trans.result
      mysql-test/r/sql_mode.result
      mysql-test/r/strict.result
      mysql-test/r/subselect.result
      mysql-test/r/subselect3.result
      mysql-test/r/system_mysql_db.result
      mysql-test/r/trigger-compat.result
      mysql-test/r/trigger.result
      mysql-test/r/trigger_notembedded.result
      mysql-test/r/type_date.result
      mysql-test/r/type_datetime.result
      mysql-test/r/type_decimal.result
      mysql-test/r/type_varchar.result
      mysql-test/r/variables.result
      mysql-test/r/view.result
      mysql-test/r/view_grant.result
      mysql-test/suite/funcs_1/datadict/basics_mixed1.inc
      mysql-test/suite/funcs_1/datadict/datadict_priv.inc
      mysql-test/suite/funcs_1/datadict/is_tables.inc
      mysql-test/suite/funcs_1/r/innodb_func_view.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
      mysql-test/suite/funcs_1/r/innodb_trig_03.result
      mysql-test/suite/funcs_1/r/innodb_trig_03e.result
      mysql-test/suite/funcs_1/r/innodb_views.result
      mysql-test/suite/funcs_1/r/is_basics_mixed.result
      mysql-test/suite/funcs_1/r/is_cml_innodb.result
      mysql-test/suite/funcs_1/r/is_cml_memory.result
      mysql-test/suite/funcs_1/r/is_cml_myisam.result
      mysql-test/suite/funcs_1/r/is_cml_ndb.result
      mysql-test/suite/funcs_1/r/is_column_privileges.result
      mysql-test/suite/funcs_1/r/is_columns.result
      mysql-test/suite/funcs_1/r/is_columns_innodb.result
      mysql-test/suite/funcs_1/r/is_columns_is.result
      mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
      mysql-test/suite/funcs_1/r/is_columns_memory.result
      mysql-test/suite/funcs_1/r/is_columns_myisam.result
      mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_columns_ndb.result
      mysql-test/suite/funcs_1/r/is_events.result
      mysql-test/suite/funcs_1/r/is_key_column_usage.result
      mysql-test/suite/funcs_1/r/is_routines.result
      mysql-test/suite/funcs_1/r/is_schema_privileges.result
      mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result
      mysql-test/suite/funcs_1/r/is_schemata.result
      mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result
      mysql-test/suite/funcs_1/r/is_statistics.result
      mysql-test/suite/funcs_1/r/is_statistics_mysql.result
      mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_table_constraints.result
      mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
      mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_table_privileges.result
      mysql-test/suite/funcs_1/r/is_tables.result
      mysql-test/suite/funcs_1/r/is_tables_innodb.result
      mysql-test/suite/funcs_1/r/is_tables_is.result
      mysql-test/suite/funcs_1/r/is_tables_memory.result
      mysql-test/suite/funcs_1/r/is_tables_myisam.result
      mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result
      mysql-test/suite/funcs_1/r/is_tables_mysql.result
      mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_tables_ndb.result
      mysql-test/suite/funcs_1/r/is_triggers.result
      mysql-test/suite/funcs_1/r/is_user_privileges.result
      mysql-test/suite/funcs_1/r/is_views.result
      mysql-test/suite/funcs_1/r/memory_func_view.result
      mysql-test/suite/funcs_1/r/memory_storedproc_07.result
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result
      mysql-test/suite/funcs_1/r/memory_trig_03.result
      mysql-test/suite/funcs_1/r/memory_trig_03e.result
      mysql-test/suite/funcs_1/r/memory_views.result
      mysql-test/suite/funcs_1/r/myisam_func_view.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
      mysql-test/suite/funcs_1/r/myisam_trig_03.result
      mysql-test/suite/funcs_1/r/myisam_trig_03e.result
      mysql-test/suite/funcs_1/r/myisam_views.result
      mysql-test/suite/funcs_1/r/ndb_func_view.result
      mysql-test/suite/funcs_1/r/ndb_storedproc_07.result
      mysql-test/suite/funcs_1/r/ndb_storedproc_08.result
      mysql-test/suite/funcs_1/r/ndb_trig_03.result
      mysql-test/suite/funcs_1/r/ndb_trig_03e.result
      mysql-test/suite/funcs_1/r/ndb_views.result
      mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_priv_ps.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/suite/funcs_1/t/is_basics_mixed.test
      mysql-test/suite/funcs_1/t/is_columns.test
      mysql-test/suite/funcs_1/t/is_user_privileges.test
      mysql-test/suite/ndb/r/ndb_dd_alter.result
      mysql-test/suite/ndb/r/ndb_dd_ddl.result
      mysql-test/suite/ndb/r/ndb_partition_range.result
      mysql-test/suite/ndb/r/ndb_restore.result
      mysql-test/suite/ndb/t/ndb_dd_ddl.test
      mysql-test/suite/parts/inc/partition_key_32col.inc
      mysql-test/suite/parts/inc/partition_syntax.inc
      mysql-test/suite/parts/r/partition_special_innodb.result
      mysql-test/suite/parts/r/partition_special_myisam.result
      mysql-test/suite/parts/r/partition_syntax_innodb.result
      mysql-test/suite/parts/r/partition_syntax_myisam.result
      mysql-test/suite/rpl/r/rpl_udf.result
      mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
      mysql-test/suite/sys_vars/r/auto_commit_basic.result
      mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result
      mysql-test/suite/sys_vars/r/big_tables_basic.result
      mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
      mysql-test/suite/sys_vars/r/flush_basic.result
      mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
      mysql-test/suite/sys_vars/r/general_log_basic.result
      mysql-test/suite/sys_vars/r/innodb_checksums_basic.result
      mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result
      mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result
      mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result
      mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result
      mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
      mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
      mysql-test/suite/sys_vars/r/local_infile_basic.result
      mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
      mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result
      mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
      mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result
      mysql-test/suite/sys_vars/r/new_basic.result
      mysql-test/suite/sys_vars/r/old_passwords_basic.result
      mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result
      mysql-test/suite/sys_vars/r/read_only_basic.result
      mysql-test/suite/sys_vars/r/relay_log_purge_basic.result
      mysql-test/suite/sys_vars/r/secure_auth_basic.result
      mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result
      mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result
      mysql-test/suite/sys_vars/r/slow_query_log_basic.result
      mysql-test/suite/sys_vars/r/sql_auto_is_null_basic.result
      mysql-test/suite/sys_vars/r/sql_big_selects_basic.result
      mysql-test/suite/sys_vars/r/sql_big_tables_basic.result
      mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result
      mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
      mysql-test/suite/sys_vars/r/sql_log_off_basic.result
      mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result
      mysql-test/suite/sys_vars/r/sql_notes_basic.result
      mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
      mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result
      mysql-test/suite/sys_vars/r/sql_warnings_basic.result
      mysql-test/suite/sys_vars/r/sync_frm_basic.result
      mysql-test/suite/sys_vars/r/timed_mutexes_basic.result
      mysql-test/suite/sys_vars/r/unique_checks_basic.result
      mysql-test/suite/sys_vars/t/auto_commit_basic.test
      mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test
      mysql-test/suite/sys_vars/t/big_tables_basic.test
      mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test
      mysql-test/suite/sys_vars/t/flush_basic.test
      mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test
      mysql-test/suite/sys_vars/t/general_log_basic.test
      mysql-test/suite/sys_vars/t/innodb_checksums_basic.test
      mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test
      mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test
      mysql-test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test
      mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test
      mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test
      mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test
      mysql-test/suite/sys_vars/t/local_infile_basic.test
      mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test
      mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test
      mysql-test/suite/sys_vars/t/low_priority_updates_basic.test
      mysql-test/suite/sys_vars/t/myisam_use_mmap_basic.test
      mysql-test/suite/sys_vars/t/new_basic.test
      mysql-test/suite/sys_vars/t/old_passwords_basic.test
      mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test
      mysql-test/suite/sys_vars/t/read_only_basic.test
      mysql-test/suite/sys_vars/t/relay_log_purge_basic.test
      mysql-test/suite/sys_vars/t/secure_auth_basic.test
      mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test
      mysql-test/suite/sys_vars/t/slave_compressed_protocol_basic.test
      mysql-test/suite/sys_vars/t/slow_query_log_basic.test
      mysql-test/suite/sys_vars/t/sql_auto_is_null_basic.test
      mysql-test/suite/sys_vars/t/sql_big_selects_basic.test
      mysql-test/suite/sys_vars/t/sql_big_tables_basic.test
      mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test
      mysql-test/suite/sys_vars/t/sql_log_bin_basic.test
      mysql-test/suite/sys_vars/t/sql_log_off_basic.test
      mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test
      mysql-test/suite/sys_vars/t/sql_notes_basic.test
      mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test
      mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test
      mysql-test/suite/sys_vars/t/sql_warnings_basic.test
      mysql-test/suite/sys_vars/t/sync_frm_basic.test
      mysql-test/suite/sys_vars/t/timed_mutexes_basic.test
      mysql-test/suite/sys_vars/t/unique_checks_basic.test
      mysql-test/t/alter_table.test
      mysql-test/t/create.test
      mysql-test/t/ctype_utf8.test
      mysql-test/t/delayed.test
      mysql-test/t/drop.test
      mysql-test/t/explain.test
      mysql-test/t/fulltext.test
      mysql-test/t/grant.test
      mysql-test/t/information_schema.test
      mysql-test/t/information_schema_db.test
      mysql-test/t/innodb_mysql.test
      mysql-test/t/insert.test
      mysql-test/t/locale.test
      mysql-test/t/log_state.test
      mysql-test/t/lowercase_table2.test
      mysql-test/t/merge.test
      mysql-test/t/outfile.test
      mysql-test/t/partition.test
      mysql-test/t/partition_datatype.test
      mysql-test/t/partition_error.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/partition_list.test
      mysql-test/t/partition_mgm_err.test
      mysql-test/t/partition_pruning.test
      mysql-test/t/partition_range.test
      mysql-test/t/profiling.test
      mysql-test/t/ps.test
      mysql-test/t/show_check.test
      mysql-test/t/sp-vars.test
      mysql-test/t/sp.test
      mysql-test/t/sp_trans.test
      mysql-test/t/sql_mode.test
      mysql-test/t/trigger.test
      mysql-test/t/type_date.test
      mysql-test/t/type_decimal.test
      mysql-test/t/type_varchar.test
      mysql-test/t/variables+c.test
      mysql-test/t/variables.test
      mysql-test/t/view_grant.test
      mysys/mf_keycaches.c
      mysys/my_largepage.c
      mysys/thr_lock.c
      scripts/mysql_system_tables.sql
      scripts/mysql_system_tables_data.sql
      scripts/mysql_system_tables_fix.sql
      sql-common/client.c
      sql/Makefile.am
      sql/event_data_objects.cc
      sql/event_scheduler.cc
      sql/events.cc
      sql/field.cc
      sql/field.h
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/hash_filo.h
      sql/hostname.cc
      sql/item.cc
      sql/item.h
      sql/item_create.cc
      sql/item_func.cc
      sql/item_subselect.cc
      sql/item_sum.cc
      sql/item_sum.h
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/lock.cc
      sql/log.cc
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/net_serv.cc
      sql/opt_range.cc
      sql/opt_sum.cc
      sql/partition_element.h
      sql/partition_info.cc
      sql/partition_info.h
      sql/procedure.h
      sql/protocol.cc
      sql/protocol.h
      sql/records.cc
      sql/repl_failsafe.cc
      sql/rpl_filter.cc
      sql/rpl_handler.cc
      sql/rpl_injector.h
      sql/rpl_tblmap.cc
      sql/rpl_tblmap.h
      sql/set_var.cc
      sql/set_var.h
      sql/share/errmsg-utf8.txt
      sql/share/errmsg.txt
      sql/slave.cc
      sql/sp.cc
      sql/sp_cache.cc
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_acl.h
      sql/sql_base.cc
      sql/sql_cache.cc
      sql/sql_cache.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_cursor.cc
      sql/sql_db.cc
      sql/sql_error.cc
      sql/sql_handler.cc
      sql/sql_help.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_list.cc
      sql/sql_list.h
      sql/sql_locale.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_profile.cc
      sql/sql_profile.h
      sql/sql_repl.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_servers.cc
      sql/sql_show.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_test.cc
      sql/sql_trigger.cc
      sql/sql_udf.cc
      sql/sql_update.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/structs.h
      sql/table.cc
      sql/table.h
      sql/tztime.cc
      storage/archive/Makefile.am
      storage/archive/ha_archive.cc
      storage/blackhole/ha_blackhole.cc
      storage/csv/ha_tina.cc
      storage/csv/ha_tina.h
      storage/example/ha_example.cc
      storage/federated/ha_federated.cc
      storage/innobase/CMakeLists.txt
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/handler0alter.h
      storage/innobase/include/row0merge.h
      storage/innobase/include/row0types.h
      storage/innobase/row/row0merge.c
      tests/mysql_client_test.c
      mysql-test/include/have_profiling.inc
      mysql-test/r/have_profiling.require
=== modified file 'mysql-test/r/ctype_collate.result'
--- a/mysql-test/r/ctype_collate.result	2009-03-19 09:26:12 +0000
+++ b/mysql-test/r/ctype_collate.result	2009-11-06 10:49:27 +0000
@@ -548,6 +548,36 @@ SELECT * FROM t1 WHERE s2 = s3;
 s1	s2	s3
 a	A	A
 DROP TABLE t1;
+create table t1 (a varchar(1) character set latin1 collate latin1_general_ci);
+insert into t1 values ('A'),('a'),('B'),('b'),('C'),('c');
+select * from t1 where a > 'B' collate latin1_bin;
+a
+a
+b
+C
+c
+select * from t1 where a <> 'B' collate latin1_bin;
+a
+A
+a
+b
+C
+c
+create index i on t1 (a);
+select * from t1 where a > 'B' collate latin1_bin;
+a
+a
+b
+C
+c
+select * from t1 where a <> 'B' collate latin1_bin;
+a
+A
+a
+b
+C
+c
+drop table t1;
 SET NAMES latin1;
 CREATE TABLE t1 
 (s1 char(10) COLLATE latin1_german1_ci,

=== modified file 'mysql-test/r/partition_column.result'
--- a/mysql-test/r/partition_column.result	2009-11-02 13:49:26 +0000
+++ b/mysql-test/r/partition_column.result	2009-11-06 10:49:27 +0000
@@ -1,4 +1,54 @@
 drop table if exists t1;
+create table t1 (a varchar(1) character set latin1 collate latin1_general_ci)
+partition by range columns(a)
+( partition p0 values less than ('a'),
+partition p1 values less than ('b'),
+partition p2 values less than ('c'),
+partition p3 values less than ('d'));
+insert into t1 values ('A'),('a'),('B'),('b'),('C'),('c');
+select * from t1 where a > 'B' collate latin1_bin;
+a
+a
+b
+C
+c
+select * from t1 where a <> 'B' collate latin1_bin;
+a
+A
+a
+b
+C
+c
+alter table t1 remove partitioning;
+select * from t1 where a > 'B' collate latin1_bin;
+a
+a
+b
+C
+c
+select * from t1 where a <> 'B' collate latin1_bin;
+a
+A
+a
+b
+C
+c
+drop table t1;
+create table t1 (a varchar(2) character set latin1,
+b varchar(2) character set latin1)
+partition by list columns(a,b)
+(partition p0 values in (('a','a')));
+insert into t1 values ('A','A');
+select * from t1 where b <> 'a' collate latin1_bin AND
+a = 'A' collate latin1_bin;
+a	b
+A	A
+alter table t1 remove partitioning;
+select * from t1 where b <> 'a' collate latin1_bin AND
+a = 'A' collate latin1_bin;
+a	b
+A	A
+drop table t1;
 create table t1 (a varchar(5))
 partition by list columns(a)
 ( partition p0 values in ('\''),

=== modified file 'mysql-test/r/partition_innodb.result'
--- a/mysql-test/r/partition_innodb.result	2009-10-29 17:04:23 +0000
+++ b/mysql-test/r/partition_innodb.result	2009-11-05 14:42:03 +0000
@@ -1,4 +1,15 @@
 drop table if exists t1;
+create table t1 (a varchar(5), b int signed, c varchar(10), d datetime)
+partition by range columns(b,c)
+subpartition by hash(to_seconds(d))
+( partition p0 values less than (2, 'b'),
+partition p1 values less than (4, 'd'),
+partition p2 values less than (10, 'za'));
+insert into t1 values ('a', 3, 'w', '2001-10-27 04:34:00');
+insert into t1 values ('r', 7, 'w', '2001-10-27 05:34:00');
+insert into t1 values ('g', 10, 'w', '2001-10-27 06:34:00');
+update t1 set a = 'c' where a > 'f';
+drop table t1;
 create table t1 (a varchar(5))
 engine=memory
 partition by range columns(a)

=== modified file 'mysql-test/t/ctype_collate.test'
--- a/mysql-test/t/ctype_collate.test	2009-03-19 08:20:28 +0000
+++ b/mysql-test/t/ctype_collate.test	2009-11-06 10:49:27 +0000
@@ -172,6 +172,18 @@ DROP TABLE t1;
 #
 # Test that optimizer doesn't use indexes with wrong collation
 #
+#
+# BUG#48447, Delivering too few records with indexes using collate syntax
+#
+create table t1 (a varchar(1) character set latin1 collate latin1_general_ci);
+insert into t1 values ('A'),('a'),('B'),('b'),('C'),('c');
+select * from t1 where a > 'B' collate latin1_bin;
+select * from t1 where a <> 'B' collate latin1_bin;
+create index i on t1 (a);
+select * from t1 where a > 'B' collate latin1_bin;
+select * from t1 where a <> 'B' collate latin1_bin;
+drop table t1;
+
 SET NAMES latin1;
 CREATE TABLE t1 
 (s1 char(10) COLLATE latin1_german1_ci,

=== modified file 'mysql-test/t/partition_column.test'
--- a/mysql-test/t/partition_column.test	2009-11-02 13:49:26 +0000
+++ b/mysql-test/t/partition_column.test	2009-11-06 10:49:27 +0000
@@ -8,6 +8,37 @@
 drop table if exists t1;
 --enable_warnings
 
+#
+# BUG#48161, Delivering too few records using collate syntax with partitions
+#
+# Test case from BUG#48447 with some extension
+create table t1 (a varchar(1) character set latin1 collate latin1_general_ci)
+partition by range columns(a)
+( partition p0 values less than ('a'),
+  partition p1 values less than ('b'),
+  partition p2 values less than ('c'),
+  partition p3 values less than ('d'));
+insert into t1 values ('A'),('a'),('B'),('b'),('C'),('c');
+select * from t1 where a > 'B' collate latin1_bin;
+select * from t1 where a <> 'B' collate latin1_bin;
+alter table t1 remove partitioning;
+select * from t1 where a > 'B' collate latin1_bin;
+select * from t1 where a <> 'B' collate latin1_bin;
+drop table t1;
+
+# Test case from BUG#48161
+create table t1 (a varchar(2) character set latin1,
+                 b varchar(2) character set latin1)
+partition by list columns(a,b)
+(partition p0 values in (('a','a')));
+insert into t1 values ('A','A');
+select * from t1 where b <> 'a' collate latin1_bin AND
+                       a = 'A' collate latin1_bin;
+alter table t1 remove partitioning;
+select * from t1 where b <> 'a' collate latin1_bin AND
+                       a = 'A' collate latin1_bin;
+drop table t1;
+
 create table t1 (a varchar(5))
 partition by list columns(a)
 ( partition p0 values in ('\''),

=== modified file 'mysql-test/t/partition_innodb.test'
--- a/mysql-test/t/partition_innodb.test	2009-10-29 17:04:23 +0000
+++ b/mysql-test/t/partition_innodb.test	2009-11-05 14:42:03 +0000
@@ -6,6 +6,21 @@ drop table if exists t1;
 --enable_warnings
 
 #
+# BUG#47774, Assertion failure in InnoDB using column list partitioning
+#
+create table t1 (a varchar(5), b int signed, c varchar(10), d datetime)
+partition by range columns(b,c)
+subpartition by hash(to_seconds(d))
+( partition p0 values less than (2, 'b'),
+  partition p1 values less than (4, 'd'),
+  partition p2 values less than (10, 'za'));
+insert into t1 values ('a', 3, 'w', '2001-10-27 04:34:00');
+insert into t1 values ('r', 7, 'w', '2001-10-27 05:34:00');
+insert into t1 values ('g', 10, 'w', '2001-10-27 06:34:00');
+update t1 set a = 'c' where a > 'f';
+drop table t1;
+
+#
 # BUG#47776, Failed to update for MEMORY engine, crash for InnoDB and success for MyISAM
 #
 create table t1 (a varchar(5))

=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2009-10-29 17:04:23 +0000
+++ b/sql/opt_range.cc	2009-11-05 14:42:03 +0000
@@ -5882,7 +5882,8 @@ get_mm_leaf(RANGE_OPT_PARAM *param, COND
       value->result_type() == STRING_RESULT &&
       key_part->image_type == Field::itRAW &&
       ((Field_str*)field)->charset() != conf_func->compare_collation() &&
-      !(conf_func->compare_collation()->state & MY_CS_BINSORT))
+      !(conf_func->compare_collation()->state & MY_CS_BINSORT &&
+        (type == Item_func::EQUAL_FUNC || type == Item_func::EQ_FUNC)))
     goto end;
 
   if (param->using_real_indexes)


Attachment: [text/bzr-bundle] bzr/[e-mail]