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

myrg_rrnd.c merge + insert OK

Browse source 
myrg_info.c	merge + insert OK
mymrgdef.h	merge + insert OK
mrg000001.test  test for the above
mysql-test-run	compatibility (FreeBSD) changes from mysql-4.0 backpropagated


mysql-test/mysql-test-run:
  compatibility (FreeBSD) changes from mysql-4.0 backpropagated
myisammrg/mymrgdef.h:
  merge + insert OK
myisammrg/myrg_info.c:
  merge + insert OK
myisammrg/myrg_rrnd.c:
  merge + insert OK
This commit is contained in:
unknown 2000-12-07 00:18:46 +01:00
commit 1ad29ca922
7 changed files with 48 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/mysql-test-run
View file

@ -147,7 +147,7 @@ echo_pass () {
prompt_user ()
{
echo $1
read
read not_used
}
echo_fail () {
@ -285,7 +285,7 @@ start_slave()
--master-connect-retry=1 \
--master-host=127.0.0.1 \
--master-port=$MASTER_MYPORT \
--core-file \
--core-file --log-bin --log-slave-updates \
--basedir=$CWD \
--datadir=$SLAVE_MYDDIR \
--pid-file=$SLAVE_MYPID \
@ -363,7 +363,7 @@ run_testcase ()
tname=`$ECHO $tname | $CUT -d . -f 1`
master_opt_file=$TESTDIR/$tname-master.opt
slave_opt_file=$TESTDIR/$tname-slave.opt
SKIP_SLAVE=`$EXPR \( match $tname rpl \) = 0`
SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
if [ -f $master_opt_file ] ;
then

1
mysql-test/r/3.23/mrg000001.dummy.result Normal file
View file

@ -0,0 +1 @@
incr othr

5
mysql-test/r/3.23/mrg000001.result Normal file
View file

@ -0,0 +1,5 @@
incr othr
1 10
2 24
4 33
3 53

17
mysql-test/t/3.23/mrg000001.test Normal file
View file

@ -0,0 +1,17 @@
DROP TABLE IF EXISTS test1;
DROP TABLE IF EXISTS test2;
DROP TABLE IF EXISTS test3;
CREATE TABLE test1 (incr int not null, othr int not null, primary key(incr));
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))
TYPE=MERGE UNION=(test1,test2);
@r/3.23/mrg000001.dummy.result SELECT * from test3;
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 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);
@r/3.23/mrg000001.result SELECT * from test3 where incr in (1,2,3,4) order by othr;