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

merge

Browse Source
This commit is contained in:
monty@work.mysql.com
2001-05-20 12:38:19 +02:00
parent f2dee22a7f c488a2cdc9
commit 914bbdca50
80 changed files with 1291 additions and 8628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/merge.result
View File

@ -127,3 +127,6 @@ t3 CREATE TABLE `t3` (
`othr` int(11) NOT NULL default '0'
) TYPE=MRG_MyISAM UNION=(t1,t2)
a
a b
1 1
1 2

6
mysql-test/r/rpl000001.result
View File

@ -7,5 +7,11 @@ sum(length(word))
0
count(*)
10
select_priv user
N blafasel2
select_priv user
Y blafasel2
n
3456
select_priv user
Y blafasel2

14
mysql-test/t/merge.test
View File

@ -96,3 +96,17 @@ drop table t3,t2,t1;
create table t1 (a int not null) type=merge;
select * from t1;
drop table t1;
#
# Bug found by Monty.
#
drop table if exists t3, t2, t1;
create table t1 (a int not null, b int not null, key(a,b));
create table t2 (a int not null, b int not null, key(a,b));
create table t3 (a int not null, b int not null, key(a,b)) TYPE=MERGE UNION=(t1,t2);
insert into t1 values (1,2),(2,1),(0,0),(4,4),(5,5),(6,6);
insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6);
flush tables;
select * from t3 where a=1 order by b limit 2;
drop table t1,t2,t3;

8
mysql-test/t/rpl000001.test
View File

@ -71,10 +71,18 @@ connection master1;
drop table t1;
create table t1 (n int);
insert into t1 values(3456);
use mysql;
insert into user (Host, User, Password)
VALUES ("10.10.10.%", "blafasel2", "blafasel2");
select select_priv,user from mysql.user where user = 'blafasel2';
update user set Select_priv = "Y" where User="blafasel2";
select select_priv,user from mysql.user where user = 'blafasel2';
use test;
save_master_pos;
connection slave;
sync_with_master;
select n from t1;
select select_priv,user from mysql.user where user = 'blafasel2';
connection master1;
drop table t1;
save_master_pos;