database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Additional fix for wl#2506

Browse Source 
mysql-test/extra/binlog_tests/ctype_cp932.test:
    fixed test case
mysql-test/r/binlog_stm_ctype_cp932.result:
    fixed test result
mysql-test/t/ctype_ucs.test:
    fixed test case
sql/sql_show.cc:
   Compilation with disabled partitioning is fixed
This commit is contained in:
unknown
2006-01-11 15:04:18 +04:00
parent 2c0f53d69c
commit 5df64b263c
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/extra/binlog_tests/ctype_cp932.test
View File

@ -434,3 +434,4 @@ insert into t1 values ('ab');
select * from t1; select * from t1;
insert into t1 values ('abc'); insert into t1 values ('abc');
select * from t1; select * from t1;
drop table t1;

1
mysql-test/r/binlog_stm_ctype_cp932.result
View File

@ -11366,3 +11366,4 @@ col1
a a
a a
a a
drop table t1;

2
mysql-test/t/ctype_ucs.test
View File

@ -424,7 +424,9 @@ drop table t1;
# #
# Bug #14583 Bug on query using a LIKE on indexed field with ucs2_bin collation # Bug #14583 Bug on query using a LIKE on indexed field with ucs2_bin collation
# #
--disable_warnings
create table t1(f1 varchar(5) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL) engine=InnoDB; create table t1(f1 varchar(5) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL) engine=InnoDB;
--enable_warnings
insert into t1 values('a'); insert into t1 values('a');
create index t1f1 on t1(f1); create index t1f1 on t1(f1);
select f1 from t1 where f1 like 'a%'; select f1 from t1 where f1 like 'a%';

7
sql/sql_show.cc
View File

@ -3582,18 +3582,22 @@ static int get_schema_partitions_record(THD *thd, struct st_table_list *tables,
TIME time; TIME time;
TABLE *show_table= tables->table; TABLE *show_table= tables->table;
handler *file= show_table->file; handler *file= show_table->file;
#ifdef WITH_PARTITION_STORAGE_ENGINE
partition_info *part_info= show_table->part_info; partition_info *part_info= show_table->part_info;
#endif
DBUG_ENTER("get_schema_partitions_record"); DBUG_ENTER("get_schema_partitions_record");
if (res) if (res)
{ {
#ifdef WITH_PARTITION_STORAGE_ENGINE
if (part_info) if (part_info)
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
thd->net.last_errno, thd->net.last_error); thd->net.last_errno, thd->net.last_error);
#endif
thd->clear_error(); thd->clear_error();
DBUG_RETURN(0); DBUG_RETURN(0);
} }
#ifdef WITH_PARTITION_STORAGE_ENGINE
if (part_info) if (part_info)
{ {
partition_element *part_elem; partition_element *part_elem;
@ -3750,6 +3754,7 @@ static int get_schema_partitions_record(THD *thd, struct st_table_list *tables,
DBUG_RETURN(0); DBUG_RETURN(0);
} }
else else
#endif
{ {
store_schema_partitions_record(thd, table, 0, file, 0); store_schema_partitions_record(thd, table, 0, file, 0);
if(schema_table_store_record(thd, table)) if(schema_table_store_record(thd, table))