database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-11 05:52:26 +03:00
Code Activity

Merge of my revision

Browse Source
This commit is contained in:
Guilhem Bichot
2008-10-15 22:00:35 +02:00
parent 2faf503e55 5aa1e3b364
commit a184d6b0a9
8 changed files with 61 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/maria/r/maria.result
View File

@@ -2590,11 +2590,6 @@ ALTER TABLE t1 CHANGE c d varchar(10);
affected rows: 0
info: Records: 0 Duplicates: 0 Warnings: 0
drop table t1;
create table t1 (s1 int);
insert into t1 values (1);
alter table t1 partition by list (s1) (partition p1 values in (2));
ERROR HY000: Table has no partition for value 1
drop table t1;
create table t1 (c1 int);
create table t2 (c1 int);
lock table t1 read, t2 read;

12
mysql-test/suite/maria/r/maria_partition.result Normal file
View File

@@ -0,0 +1,12 @@
set global storage_engine=maria;
set session storage_engine=maria;
set global maria_page_checksum=0;
set global maria_log_file_size=4294967295;
drop table if exists t1,t2;
drop view if exists v1;
SET SQL_WARNINGS=1;
create table t1 (s1 int);
insert into t1 values (1);
alter table t1 partition by list (s1) (partition p1 values in (2));
ERROR HY000: Table has no partition for value 1
drop table t1;

23
mysql-test/suite/maria/t/maria.test
View File

@@ -1817,12 +1817,6 @@ lock table t1 write concurrent;
delete from t1;
drop table t1;
--disable_result_log
--disable_query_log
eval set global storage_engine=$default_engine, maria_page_checksum=$default_checksum;
--enable_result_log
--enable_query_log
#
# Bug#39243 SELECT WHERE does not find row
# (Problem with skip_row)
@@ -1867,16 +1861,6 @@ ALTER TABLE t1 CHANGE c d varchar(10);
--disable_info
drop table t1;
#
# Bug #39227 Maria: crash with ALTER TABLE PARTITION
#
create table t1 (s1 int);
insert into t1 values (1);
--error ER_NO_PARTITION_FOR_GIVEN_VALUE
alter table t1 partition by list (s1) (partition p1 values in (2));
drop table t1;
#
# Bug #39226 Maria: crash with FLUSH TABLES WITH READ LOCK after LOCK TABLES
@@ -1886,3 +1870,10 @@ lock table t1 read, t2 read;
flush tables with read lock;
unlock tables;
drop table t1, t2;
# Set defaults back
--disable_result_log
--disable_query_log
eval set global storage_engine=$default_engine, maria_page_checksum=$default_checksum;
--enable_result_log
--enable_query_log

35
mysql-test/suite/maria/t/maria_partition.test Normal file
View File

@@ -0,0 +1,35 @@
# Maria tests which require partitioning enabled
--source include/have_partition.inc
-- source include/have_maria.inc
let $default_engine=`select @@global.storage_engine`;
let $default_checksum=`select @@global.maria_page_checksum`;
set global storage_engine=maria;
set session storage_engine=maria;
set global maria_page_checksum=0;
set global maria_log_file_size=4294967295;
# Initialise
--disable_warnings
drop table if exists t1,t2;
drop view if exists v1;
--enable_warnings
SET SQL_WARNINGS=1;
#
# Bug #39227 Maria: crash with ALTER TABLE PARTITION
#
create table t1 (s1 int);
insert into t1 values (1);
--error ER_NO_PARTITION_FOR_GIVEN_VALUE
alter table t1 partition by list (s1) (partition p1 values in (2));
drop table t1;
# Set defaults back
--disable_result_log
--disable_query_log
eval set global storage_engine=$default_engine, maria_page_checksum=$default_checksum;
--enable_result_log
--enable_query_log