1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  c-520ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug13520


sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  SCCS merged
mysql-test/t/partition.test:
  SCCS merged
This commit is contained in:
unknown 2006-04-01 00:59:25 -05:00
commit 9eccbdaa88
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/partition.result
View File

@ -718,6 +718,16 @@ CALL test.p1(13);
Warnings: Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back Warning 1196 Some non-transactional changed tables couldn't be rolled back
drop table t1; drop table t1;
CREATE TABLE t1 (a int not null)
partition by key(a)
(partition p0 COMMENT='first partition');
drop table t1;
CREATE TABLE t1 (`a b` int not null)
partition by key(`a b`);
drop table t1;
CREATE TABLE t1 (`a b` int not null)
partition by hash(`a b`);
drop table t1;
create table t1 (f1 integer) partition by range(f1) create table t1 (f1 integer) partition by range(f1)
(partition p1 values less than (0), partition p2 values less than (10)); (partition p1 values less than (0), partition p2 values less than (10));
insert into t1 set f1 = null; insert into t1 set f1 = null;

19
mysql-test/t/partition.test
View File

@ -849,6 +849,25 @@ CALL test.p1(12);
CALL test.p1(13); CALL test.p1(13);
drop table t1; drop table t1;
#
# Bug 13520: Problem with delimiters in COMMENT DATA DIRECTORY ..
#
CREATE TABLE t1 (a int not null)
partition by key(a)
(partition p0 COMMENT='first partition');
drop table t1;
#
# Bug 13433: Problem with delimited identifiers
#
CREATE TABLE t1 (`a b` int not null)
partition by key(`a b`);
drop table t1;
CREATE TABLE t1 (`a b` int not null)
partition by hash(`a b`);
drop table t1;
# #
# Bug#18053 Partitions: crash if null # Bug#18053 Partitions: crash if null
# Bug#18070 Partitions: wrong result on WHERE ... IS NULL # Bug#18070 Partitions: wrong result on WHERE ... IS NULL

16
sql/sql_partition.cc
View File

@ -1508,6 +1508,11 @@ static int add_write(File fptr, const char *buf, uint len)
return 1; return 1;
} }
static int add_string_object(File fptr, String *string)
{
return add_write(fptr, string->ptr(), string->length());
}
static int add_string(File fptr, const char *string) static int add_string(File fptr, const char *string)
{ {
return add_write(fptr, string, strlen(string)); return add_write(fptr, string, strlen(string));
@ -1594,7 +1599,14 @@ static int add_key_partition(File fptr, List<char> field_list)
while (i < no_fields) while (i < no_fields)
{ {
const char *field_str= part_it++; const char *field_str= part_it++;
err+= add_string(fptr, field_str); String field_string("", 0, system_charset_info);
THD *thd= current_thd;
ulonglong save_options= thd->options;
thd->options= 0;
append_identifier(thd, &field_string, field_str,
strlen(field_str));
thd->options= save_options;
err+= add_string_object(fptr, &field_string);
if (i != (no_fields-1)) if (i != (no_fields-1))
err+= add_comma(fptr); err+= add_comma(fptr);
i++; i++;
@ -1664,7 +1676,7 @@ static int add_partition_options(File fptr, partition_element *p_elem)
err+= add_keyword_string(fptr, "INDEX DIRECTORY", TRUE, err+= add_keyword_string(fptr, "INDEX DIRECTORY", TRUE,
p_elem->index_file_name); p_elem->index_file_name);
if (p_elem->part_comment) if (p_elem->part_comment)
err+= add_keyword_string(fptr, "COMMENT", FALSE, p_elem->part_comment); err+= add_keyword_string(fptr, "COMMENT", TRUE, p_elem->part_comment);
return err + add_engine(fptr,p_elem->engine_type); return err + add_engine(fptr,p_elem->engine_type);
} }