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

Fix for bad merge.

Browse Source 
mysql-test/r/archive.result:
  Updated result file
mysql-test/t/archive.test:
  Test fix. The INSERT DELAYED test must always come last.
sql/examples/ha_archive.h:
  Bad merge.
This commit is contained in:
unknown
2005-08-30 11:04:23 -07:00
parent 489e0f3bf8
commit 98a0f14dd9
3 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
mysql-test/r/archive.result
View File

@ -6255,35 +6255,6 @@ auto fld1 companynr fld3 fld4 fld5 fld6
2 011401 37 breaking dreaded Steinberg W 2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring 3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily 4 011403 37 intercepted audiology tinily
INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
create table t3 engine=archive select * from t2;
select * from t3 where fld3='bonfire';
auto fld1 companynr fld3 fld4 fld5 fld6
1191 068504 00 bonfire corresponds positively
select count(*) from t3;
count(*)
1203
rename table t3 to t4;
select * from t4 where fld3='bonfire';
auto fld1 companynr fld3 fld4 fld5 fld6
1191 068504 00 bonfire corresponds positively
select count(*) from t4;
count(*)
1203
create table t3 engine=archive select * from t2;
select * from t3 where fld3='bonfire';
auto fld1 companynr fld3 fld4 fld5 fld6
1191 068504 00 bonfire corresponds positively
select count(*) from t3;
count(*)
1203
rename table t3 to t4;
select * from t4 where fld3='bonfire';
auto fld1 companynr fld3 fld4 fld5 fld6
1191 068504 00 bonfire corresponds positively
select count(*) from t4;
count(*)
1203
DELETE FROM t2; DELETE FROM t2;
SELECT * FROM t2; SELECT * FROM t2;
auto fld1 companynr fld3 fld4 fld5 fld6 auto fld1 companynr fld3 fld4 fld5 fld6
@ -7490,6 +7461,13 @@ auto fld1 companynr fld3 fld4 fld5 fld6
2 011401 37 breaking dreaded Steinberg W 2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring 3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily 4 011403 37 intercepted audiology tinily
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
1 000001 00 Omaha teethe neat
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W'); INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring',''); INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''); INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
@ -8701,6 +8679,13 @@ auto fld1 companynr fld3 fld4 fld5 fld6
2 011401 37 breaking dreaded Steinberg W 2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring 3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily 4 011403 37 intercepted audiology tinily
1 000001 00 Omaha teethe neat
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
TRUNCATE TABLE t2; TRUNCATE TABLE t2;
SELECT * FROM t2; SELECT * FROM t2;
auto fld1 companynr fld3 fld4 fld5 fld6 auto fld1 companynr fld3 fld4 fld5 fld6
@ -9910,4 +9895,12 @@ auto fld1 companynr fld3 fld4 fld5 fld6
2 011401 37 breaking dreaded Steinberg W 2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring 3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily 4 011403 37 intercepted audiology tinily
1 000001 00 Omaha teethe neat
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
2 011401 37 breaking dreaded Steinberg W
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
drop table t1, t2, t4; drop table t1, t2, t4;

19
mysql-test/t/archive.test
View File

@ -1302,6 +1302,7 @@ rename table t3 to t4;
select * from t4 where fld3='bonfire'; select * from t4 where fld3='bonfire';
select count(*) from t4; select count(*) from t4;
# End of 4.1 tests
# #
# Test for insert after select # Test for insert after select
@ -1326,15 +1327,6 @@ SELECT * FROM t2;
INSERT INTO t2 VALUES (1,000001,00,'Omaha','teethe','neat','') , (2,011401,37,'breaking','dreaded','Steinberg','W') , (3,011402,37,'Romans','scholastics','jarring','') , (4,011403,37,'intercepted','audiology','tinily',''); INSERT INTO t2 VALUES (1,000001,00,'Omaha','teethe','neat','') , (2,011401,37,'breaking','dreaded','Steinberg','W') , (3,011402,37,'Romans','scholastics','jarring','') , (4,011403,37,'intercepted','audiology','tinily','');
SELECT * FROM t2; SELECT * FROM t2;
# Just test syntax, we will never know if the out put is right or wrong
# Must be the last test
INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
#
# Cleanup, test is over
#
# End of 4.1 tests
# #
# For bug #12836 # For bug #12836
# Delete was allowing all rows to be removed # Delete was allowing all rows to be removed
@ -1347,4 +1339,13 @@ SELECT * FROM t2;
TRUNCATE TABLE t2; TRUNCATE TABLE t2;
SELECT * FROM t2; SELECT * FROM t2;
# Just test syntax, we will never know if the out put is right or wrong
# Must be the last test
INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
#
# Cleanup, test is over
#
drop table t1, t2, t4; drop table t1, t2, t4;

2
sql/examples/ha_archive.h
View File

@ -78,7 +78,7 @@ public:
int close(void); int close(void);
int write_row(byte * buf); int write_row(byte * buf);
int real_write_row(byte *buf, gzFile writer); int real_write_row(byte *buf, gzFile writer);
int delete_row(const byte * buf); int delete_all_rows();
int rnd_init(bool scan=1); int rnd_init(bool scan=1);
int rnd_next(byte *buf); int rnd_next(byte *buf);
int rnd_pos(byte * buf, byte *pos); int rnd_pos(byte * buf, byte *pos);