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
a5f440f8
Commit
a5f440f8
authored
May 04, 2006
by
tnurnberg@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql-4.1-19025e
parents
2f154ab4
5becb110
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
134 additions
and
5 deletions
+134
-5
mysql-test/r/auto_increment.result
mysql-test/r/auto_increment.result
+24
-0
mysql-test/r/gis-rtree.result
mysql-test/r/gis-rtree.result
+1
-1
mysql-test/r/mysqldump.result
mysql-test/r/mysqldump.result
+38
-0
mysql-test/r/symlink.result
mysql-test/r/symlink.result
+2
-2
mysql-test/t/auto_increment.test
mysql-test/t/auto_increment.test
+20
-1
mysql-test/t/mysqldump.test
mysql-test/t/mysqldump.test
+31
-1
sql/sql_show.cc
sql/sql_show.cc
+18
-0
No files found.
mysql-test/r/auto_increment.result
View file @
a5f440f8
...
...
@@ -355,3 +355,27 @@ CHECK TABLE t1;
Table Op Msg_type Msg_text
test.t1 check status OK
DROP TABLE IF EXISTS t1;
CREATE TABLE `t1` (
t1_name VARCHAR(255) DEFAULT NULL,
t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
KEY (t1_name),
PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1000;
INSERT INTO t1 (t1_name) VALUES('MySQL');
INSERT INTO t1 (t1_name) VALUES('MySQL');
INSERT INTO t1 (t1_name) VALUES('MySQL');
SELECT * from t1;
t1_name t1_id
MySQL 1000
MySQL 1001
MySQL 1002
SHOW CREATE TABLE `t1`;
Table Create Table
t1 CREATE TABLE `t1` (
`t1_name` varchar(255) default NULL,
`t1_id` int(10) unsigned NOT NULL auto_increment,
PRIMARY KEY (`t1_id`),
KEY `t1_name` (`t1_name`)
) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1
DROP TABLE `t1`;
End of 4.1 tests
mysql-test/r/gis-rtree.result
View file @
a5f440f8
...
...
@@ -294,7 +294,7 @@ t2 CREATE TABLE `t2` (
`g` geometry NOT NULL default '',
PRIMARY KEY (`fid`),
SPATIAL KEY `g` (`g`(32))
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM
AUTO_INCREMENT=101
DEFAULT CHARSET=latin1
SELECT count(*) FROM t2;
count(*)
100
...
...
mysql-test/r/mysqldump.result
View file @
a5f440f8
...
...
@@ -1503,3 +1503,41 @@ select * from t1;
a b
Osnabrck Kln
drop table t1;
create table `t1` (
t1_name varchar(255) default null,
t1_id int(10) unsigned not null auto_increment,
key (t1_name),
primary key (t1_id)
) auto_increment = 1000 default charset=latin1;
insert into t1 (t1_name) values('bla');
insert into t1 (t1_name) values('bla');
insert into t1 (t1_name) values('bla');
select * from t1;
t1_name t1_id
bla 1000
bla 1001
bla 1002
show create table `t1`;
Table Create Table
t1 CREATE TABLE `t1` (
`t1_name` varchar(255) default NULL,
`t1_id` int(10) unsigned NOT NULL auto_increment,
PRIMARY KEY (`t1_id`),
KEY `t1_name` (`t1_name`)
) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1
DROP TABLE `t1`;
select * from t1;
t1_name t1_id
bla 1000
bla 1001
bla 1002
show create table `t1`;
Table Create Table
t1 CREATE TABLE `t1` (
`t1_name` varchar(255) default NULL,
`t1_id` int(10) unsigned NOT NULL auto_increment,
PRIMARY KEY (`t1_id`),
KEY `t1_name` (`t1_name`)
) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1
drop table `t1`;
End of 4.1 tests
mysql-test/r/symlink.result
View file @
a5f440f8
...
...
@@ -40,7 +40,7 @@ t9 CREATE TABLE `t9` (
`b` char(16) NOT NULL default '',
`c` int(11) NOT NULL default '0',
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'
) ENGINE=MyISAM
AUTO_INCREMENT=16725
DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'
alter table t9 rename t8, add column d int not null;
alter table t8 rename t7;
rename table t7 to t9;
...
...
@@ -62,7 +62,7 @@ t9 CREATE TABLE `t9` (
`c` int(11) NOT NULL default '0',
`d` int(11) NOT NULL default '0',
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'
) ENGINE=MyISAM
AUTO_INCREMENT=16725
DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'
drop database mysqltest;
create table t1 (a int not null) engine=myisam;
show create table t1;
...
...
mysql-test/t/auto_increment.test
View file @
a5f440f8
...
...
@@ -219,4 +219,23 @@ INSERT INTO t1 (b) VALUES ('bbbb');
CHECK
TABLE
t1
;
DROP
TABLE
IF
EXISTS
t1
;
# End of 4.1 tests
# BUG #19025:
CREATE
TABLE
`t1`
(
t1_name
VARCHAR
(
255
)
DEFAULT
NULL
,
t1_id
INT
(
10
)
UNSIGNED
NOT
NULL
AUTO_INCREMENT
,
KEY
(
t1_name
),
PRIMARY
KEY
(
t1_id
)
)
AUTO_INCREMENT
=
1000
;
INSERT
INTO
t1
(
t1_name
)
VALUES
(
'MySQL'
);
INSERT
INTO
t1
(
t1_name
)
VALUES
(
'MySQL'
);
INSERT
INTO
t1
(
t1_name
)
VALUES
(
'MySQL'
);
SELECT
*
from
t1
;
SHOW
CREATE
TABLE
`t1`
;
DROP
TABLE
`t1`
;
--
echo
End
of
4.1
tests
mysql-test/t/mysqldump.test
View file @
a5f440f8
...
...
@@ -647,4 +647,34 @@ select * from t1;
select
*
from
t1
;
drop
table
t1
;
# End of 4.1 tests
#
# BUG #19025 mysqldump doesn't correctly dump "auto_increment = [int]"
#
create
table
`t1`
(
t1_name
varchar
(
255
)
default
null
,
t1_id
int
(
10
)
unsigned
not
null
auto_increment
,
key
(
t1_name
),
primary
key
(
t1_id
)
)
auto_increment
=
1000
default
charset
=
latin1
;
insert
into
t1
(
t1_name
)
values
(
'bla'
);
insert
into
t1
(
t1_name
)
values
(
'bla'
);
insert
into
t1
(
t1_name
)
values
(
'bla'
);
select
*
from
t1
;
show
create
table
`t1`
;
--
exec
$MYSQL_DUMP
--
skip
-
comments
test
t1
>
$MYSQLTEST_VARDIR
/
tmp
/
bug19025
.
sql
DROP
TABLE
`t1`
;
--
exec
$MYSQL
test
<
$MYSQLTEST_VARDIR
/
tmp
/
bug19025
.
sql
select
*
from
t1
;
show
create
table
`t1`
;
drop
table
`t1`
;
--
echo
End
of
4.1
tests
sql/sql_show.cc
View file @
a5f440f8
...
...
@@ -1480,6 +1480,24 @@ store_create_info(THD *thd, TABLE *table, String *packet)
packet
->
append
(
" ENGINE="
,
8
);
packet
->
append
(
file
->
table_type
());
/*
Add AUTO_INCREMENT=... if there is an AUTO_INCREMENT column,
and NEXT_ID > 1 (the default). We must not print the clause
for engines that do not support this as it would break the
import of dumps, but as of this writing, the test for whether
AUTO_INCREMENT columns are allowed and wether AUTO_INCREMENT=...
is supported is identical, !(file->table_flags() & HA_NO_AUTO_INCREMENT))
Because of that, we do not explicitly test for the feature,
but may extrapolate its existence from that of an AUTO_INCREMENT column.
*/
if
(
create_info
.
auto_increment_value
>
1
)
{
packet
->
append
(
" AUTO_INCREMENT="
,
16
);
end
=
longlong10_to_str
(
create_info
.
auto_increment_value
,
buff
,
10
);
packet
->
append
(
buff
,
(
uint
)
(
end
-
buff
));
}
if
(
table
->
table_charset
&&
!
(
thd
->
variables
.
sql_mode
&
MODE_MYSQL323
)
&&
!
(
thd
->
variables
.
sql_mode
&
MODE_MYSQL40
))
...
...
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