mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-08 16:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/jimw/my/mysql-5.1-16775

Browse source 
into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/ha_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  Resolve conflicts
mysql-test/t/partition.test:
  Resolve conflicts
This commit is contained in:
unknown 2006-02-15 11:36:45 -08:00
commit 59f2e885ce
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mysql-test/r/partition.result
View file

@ -300,3 +300,11 @@ select * from t1 where f1 = 10;
f1 f2 f1 f2
10 1 10 1
drop table t1; drop table t1;
set session storage_engine= 'memory';
create table t1 (f_int1 int(11) default null) engine = memory
partition by range (f_int1) subpartition by hash (f_int1)
(partition part1 values less than (1000)
(subpartition subpart11 engine = memory));
set session storage_engine='myisam';
drop table t1;
End of 5.1 tests

13
mysql-test/t/partition.test
View file

@ -380,3 +380,16 @@ partition partf values less than (10000));
insert into t1 values(10,1); insert into t1 values(10,1);
select * from t1 where f1 = 10; select * from t1 where f1 = 10;
drop table t1; drop table t1;
#
# Bug #16775: Wrong engine type stored for subpartition
#
set session storage_engine= 'memory';
create table t1 (f_int1 int(11) default null) engine = memory
partition by range (f_int1) subpartition by hash (f_int1)
(partition part1 values less than (1000)
(subpartition subpart11 engine = memory));
set session storage_engine='myisam';
drop table t1;
--echo End of 5.1 tests

5
sql/ha_partition.cc
View file

@ -1937,7 +1937,8 @@ bool ha_partition::create_handler_file(const char *name)
name_buffer_ptr+= name_add(name_buffer_ptr, name_buffer_ptr+= name_add(name_buffer_ptr,
part_name, part_name,
subpart_name); subpart_name);
*engine_array= (uchar) ha_legacy_type(part_elem->engine_type); *engine_array= (uchar) ha_legacy_type(subpart_elem->engine_type);
DBUG_PRINT("info", ("engine: %u", *engine_array));
engine_array++; engine_array++;
} }
} }
@ -1954,7 +1955,7 @@ bool ha_partition::create_handler_file(const char *name)
Create and write and close file Create and write and close file
to be used at open, delete_table and rename_table to be used at open, delete_table and rename_table
*/ */
fn_format(file_name, name, "", ".par", MY_APPEND_EXT); fn_format(file_name, name, "", ha_par_ext, MY_APPEND_EXT);
if ((file= my_create(file_name, CREATE_MODE, O_RDWR | O_TRUNC, if ((file= my_create(file_name, CREATE_MODE, O_RDWR | O_TRUNC,
MYF(MY_WME))) >= 0) MYF(MY_WME))) >= 0)
{ {