Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
bd806f78
Commit
bd806f78
authored
Aug 30, 2005
by
brian@zim.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for bad merge.
parent
3091eb3f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
39 deletions
+33
-39
mysql-test/r/archive.result
mysql-test/r/archive.result
+22
-29
mysql-test/t/archive.test
mysql-test/t/archive.test
+10
-9
sql/examples/ha_archive.h
sql/examples/ha_archive.h
+1
-1
No files found.
mysql-test/r/archive.result
View file @
bd806f78
...
@@ -6255,35 +6255,6 @@ auto fld1 companynr fld3 fld4 fld5 fld6
...
@@ -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
...
@@ -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
...
@@ -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
...
@@ -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;
mysql-test/t/archive.test
View file @
bd806f78
...
@@ -1302,6 +1302,7 @@ rename table t3 to t4;
...
@@ -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;
...
@@ -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;
...
@@ -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
;
sql/examples/ha_archive.h
View file @
bd806f78
...
@@ -78,7 +78,7 @@ public:
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment