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
18150150
Commit
18150150
authored
Dec 15, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/new/mysql-5.0
parents
9a3de944
08973f5c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
1 deletion
+16
-1
sql/ha_innodb.cc
sql/ha_innodb.cc
+16
-1
No files found.
sql/ha_innodb.cc
View file @
18150150
...
@@ -1326,7 +1326,7 @@ innobase_commit(
...
@@ -1326,7 +1326,7 @@ innobase_commit(
&innodb_dummy_stmt_trx_handle: the latter means
&innodb_dummy_stmt_trx_handle: the latter means
that the current SQL statement ended */
that the current SQL statement ended */
{
{
trx_t
*
trx
;
trx_t
*
trx
;
DBUG_ENTER
(
"innobase_commit"
);
DBUG_ENTER
(
"innobase_commit"
);
DBUG_PRINT
(
"trans"
,
(
"ending transaction"
));
DBUG_PRINT
(
"trans"
,
(
"ending transaction"
));
...
@@ -3830,6 +3830,7 @@ ha_innobase::create(
...
@@ -3830,6 +3830,7 @@ ha_innobase::create(
char
name2
[
FN_REFLEN
];
char
name2
[
FN_REFLEN
];
char
norm_name
[
FN_REFLEN
];
char
norm_name
[
FN_REFLEN
];
THD
*
thd
=
current_thd
;
THD
*
thd
=
current_thd
;
ib_longlong
auto_inc_value
;
DBUG_ENTER
(
"ha_innobase::create"
);
DBUG_ENTER
(
"ha_innobase::create"
);
...
@@ -4000,6 +4001,20 @@ ha_innobase::create(
...
@@ -4000,6 +4001,20 @@ ha_innobase::create(
DBUG_ASSERT
(
innobase_table
!=
0
);
DBUG_ASSERT
(
innobase_table
!=
0
);
if
(
thd
->
lex
->
sql_command
==
SQLCOM_ALTER_TABLE
&&
(
thd
->
lex
->
create_info
.
used_fields
&
HA_CREATE_USED_AUTO
)
&&
(
thd
->
lex
->
create_info
.
auto_increment_value
!=
0
))
{
/* Query was ALTER TABLE...AUTO_INC = x; Find out a table
definition from the dictionary and get the current value
of the auto increment field. Set a new value to the
auto increment field if the new value is creater than
the current value. */
auto_inc_value
=
thd
->
lex
->
create_info
.
auto_increment_value
;
dict_table_autoinc_initialize
(
innobase_table
,
auto_inc_value
);
}
/* Tell the InnoDB server that there might be work for
/* Tell the InnoDB server that there might be work for
utility threads: */
utility threads: */
...
...
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