database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

ok, here comes the push - prepare to resolve conflicts! And lets hope bk can gracefully handle all of my renames

Browse Source
This commit is contained in:
sasha@mysql.sashanet.com
2000-12-07 10:14:28 -07:00
parent 4d7d9c7f8f
commit 7ccba68095
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.bzrignore
View File

@ -408,3 +408,5 @@ BitKeeper/etc/config
BitKeeper/tmp/CONTENTS BitKeeper/tmp/CONTENTS
BitKeeper/tmp/patch BitKeeper/tmp/patch
BitKeeper/tmp/pid BitKeeper/tmp/pid
mysql-test/var/lib/test/test3.frm
mysql-test/var/lib/test/test3.MRG

4
mysql-test/t/mrg000001.test
View File

@ -7,11 +7,11 @@ CREATE TABLE test2 (incr int not null, othr int not null, primary key(incr));
CREATE TABLE test3 (incr int not null, othr int not null, primary key(incr)) CREATE TABLE test3 (incr int not null, othr int not null, primary key(incr))
TYPE=MERGE UNION=(test1,test2); TYPE=MERGE UNION=(test1,test2);
@r/3.23/mrg000001.dummy.result SELECT * from test3; @r/mrg000001.dummy.result SELECT * from test3;
INSERT INTO test1 VALUES ( 1,10),( 3,53),( 5,21),( 7,12),( 9,17); INSERT INTO test1 VALUES ( 1,10),( 3,53),( 5,21),( 7,12),( 9,17);
INSERT INTO test2 VALUES ( 2,24),( 4,33),( 6,41),( 8,26),( 0,32); INSERT INTO test2 VALUES ( 2,24),( 4,33),( 6,41),( 8,26),( 0,32);
INSERT INTO test1 VALUES (11,20),(13,43),(15,11),(17,22),(19,37); INSERT INTO test1 VALUES (11,20),(13,43),(15,11),(17,22),(19,37);
INSERT INTO test2 VALUES (12,25),(14,31),(16,42),(18,27),(10,30); INSERT INTO test2 VALUES (12,25),(14,31),(16,42),(18,27),(10,30);
@r/3.23/mrg000001.result SELECT * from test3 where incr in (1,2,3,4) order by othr; @r/mrg000001.result SELECT * from test3 where incr in (1,2,3,4) order by othr;

1
sql/log.cc
View File

@ -596,7 +596,6 @@ bool MYSQL_LOG::write(THD *thd,enum enum_server_command command,
sql_print_error(ER(ER_ERROR_ON_WRITE),name,error); sql_print_error(ER(ER_ERROR_ON_WRITE),name,error);
} }
va_end(args); va_end(args);
VOID(pthread_mutex_unlock(&LOCK_log));
} }
VOID(pthread_mutex_unlock(&LOCK_log)); VOID(pthread_mutex_unlock(&LOCK_log));
return error != 0; return error != 0;