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
c15a5a2b
Commit
c15a5a2b
authored
Jun 15, 2006
by
ramil@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0
parents
00fcdf8c
26fa98a2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
74 additions
and
0 deletions
+74
-0
mysql-test/r/archive.result
mysql-test/r/archive.result
+2
-0
mysql-test/r/auto_increment.result
mysql-test/r/auto_increment.result
+22
-0
mysql-test/r/rpl_log.result
mysql-test/r/rpl_log.result
+17
-0
mysql-test/t/archive.test
mysql-test/t/archive.test
+2
-0
mysql-test/t/auto_increment.test
mysql-test/t/auto_increment.test
+17
-0
mysql-test/t/rpl_log.test
mysql-test/t/rpl_log.test
+14
-0
No files found.
mysql-test/r/archive.result
View file @
c15a5a2b
...
...
@@ -6254,6 +6254,7 @@ auto fld1 companynr fld3 fld4 fld5 fld6
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
DELETE FROM t2;
ERROR HY000: Table storage engine for 't2' doesn't have this option
SELECT * FROM t2;
auto fld1 companynr fld3 fld4 fld5 fld6
1 000001 00 Omaha teethe neat
...
...
@@ -8685,6 +8686,7 @@ auto fld1 companynr fld3 fld4 fld5 fld6
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
TRUNCATE TABLE t2;
ERROR HY000: Table storage engine for 't2' doesn't have this option
SELECT * FROM t2;
auto fld1 companynr fld3 fld4 fld5 fld6
1 000001 00 Omaha teethe neat
...
...
mysql-test/r/auto_increment.result
View file @
c15a5a2b
...
...
@@ -378,6 +378,28 @@ t1 CREATE TABLE `t1` (
KEY `t1_name` (`t1_name`)
) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1
DROP TABLE `t1`;
create table t1(a int not null auto_increment primary key);
create table t2(a int not null auto_increment primary key, t1a int);
insert into t1 values(NULL);
insert into t2 values (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID());
insert into t1 values (NULL);
insert into t2 values (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID()),
(NULL, LAST_INSERT_ID());
insert into t1 values (NULL);
insert into t2 values (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID()),
(NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID());
select * from t2;
a t1a
1 1
2 1
3 2
4 2
5 2
6 3
7 3
8 3
9 3
drop table t1, t2;
End of 4.1 tests
CREATE TABLE t1 ( `a` int(11) NOT NULL auto_increment, `b` int(11) default NULL,PRIMARY KEY (`a`),UNIQUE KEY `b` (`b`));
insert into t1 (b) values (1);
...
...
mysql-test/r/rpl_log.result
View file @
c15a5a2b
...
...
@@ -101,3 +101,20 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File
# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 510 # # master-bin.000002 Yes Yes 0 0 510 # None 0 No #
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
create table t1(a int auto_increment primary key, b int);
insert into t1 values (NULL, 1);
reset master;
set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events;
Log_name Pos Event_type Server_id Orig_log_pos Info
slave-bin.000001 4 Start 2 4 Server ver: VERSION, Binlog ver: 3
slave-bin.000001 79 Intvar 2 79 LAST_INSERT_ID=1
slave-bin.000001 107 Intvar 2 107 INSERT_ID=5
slave-bin.000001 135 Query 2 135 use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id())
select * from t1;
a b
1 1
5 1
6 1
drop table t1;
mysql-test/t/archive.test
View file @
c15a5a2b
...
...
@@ -1330,12 +1330,14 @@ SELECT * FROM t2;
#
# For bug #12836
# Delete was allowing all rows to be removed
--
error
1031
DELETE
FROM
t2
;
SELECT
*
FROM
t2
;
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
(
4
,
011403
,
37
,
'intercepted'
,
'audiology'
,
'tinily'
,
''
);
SELECT
*
FROM
t2
;
--
error
1031
TRUNCATE
TABLE
t2
;
SELECT
*
FROM
t2
;
...
...
mysql-test/t/auto_increment.test
View file @
c15a5a2b
...
...
@@ -238,6 +238,23 @@ SHOW CREATE TABLE `t1`;
DROP
TABLE
`t1`
;
#
# Bug #6880: LAST_INSERT_ID() within a statement
#
create
table
t1
(
a
int
not
null
auto_increment
primary
key
);
create
table
t2
(
a
int
not
null
auto_increment
primary
key
,
t1a
int
);
insert
into
t1
values
(
NULL
);
insert
into
t2
values
(
NULL
,
LAST_INSERT_ID
()),
(
NULL
,
LAST_INSERT_ID
());
insert
into
t1
values
(
NULL
);
insert
into
t2
values
(
NULL
,
LAST_INSERT_ID
()),
(
NULL
,
LAST_INSERT_ID
()),
(
NULL
,
LAST_INSERT_ID
());
insert
into
t1
values
(
NULL
);
insert
into
t2
values
(
NULL
,
LAST_INSERT_ID
()),
(
NULL
,
LAST_INSERT_ID
()),
(
NULL
,
LAST_INSERT_ID
()),
(
NULL
,
LAST_INSERT_ID
());
select
*
from
t2
;
drop
table
t1
,
t2
;
--
echo
End
of
4.1
tests
#
...
...
mysql-test/t/rpl_log.test
View file @
c15a5a2b
...
...
@@ -109,5 +109,19 @@ show slave status;
--
error
1220
show
binlog
events
in
'slave-bin.000005'
from
4
;
#
# Bug #6880: LAST_INSERT_ID() within a statement
#
create
table
t1
(
a
int
auto_increment
primary
key
,
b
int
);
insert
into
t1
values
(
NULL
,
1
);
reset
master
;
set
insert_id
=
5
;
insert
into
t1
values
(
NULL
,
last_insert_id
()),
(
NULL
,
last_insert_id
());
--
replace_result
$VERSION
VERSION
show
binlog
events
;
select
*
from
t1
;
drop
table
t1
;
# End of 4.1 tests
# Adding comment for force manual merge 5.0 -> wl1012: Delete me
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