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
9be267cb
Commit
9be267cb
authored
Jun 04, 2007
by
ramil/ram@ramil.myoffice.izhnet.ru
Browse files
Options
Browse Files
Download
Plain Diff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/ram/work/b28652/b28652.5.0
parents
bc651da0
2b2a8073
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
12 deletions
+25
-12
mysql-test/r/innodb_mysql.result
mysql-test/r/innodb_mysql.result
+8
-0
mysql-test/t/innodb_mysql.test
mysql-test/t/innodb_mysql.test
+8
-0
sql/sql_table.cc
sql/sql_table.cc
+9
-12
No files found.
mysql-test/r/innodb_mysql.result
View file @
9be267cb
...
...
@@ -617,4 +617,12 @@ EXPLAIN SELECT COUNT(*) FROM t2 WHERE stat_id IN (1,3) AND acct_id=785;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 range idx1,idx2 idx1 9 NULL 2 Using where; Using index
DROP TABLE t1,t2;
create table t1(a int) engine=innodb;
alter table t1 comment '123';
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) default NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='123'
drop table t1;
End of 5.0 tests
mysql-test/t/innodb_mysql.test
View file @
9be267cb
...
...
@@ -597,4 +597,12 @@ EXPLAIN SELECT COUNT(*) FROM t2 WHERE stat_id IN (1,3) AND acct_id=785;
DROP
TABLE
t1
,
t2
;
#
# Bug #28652: assert when alter innodb table operation
#
create
table
t1
(
a
int
)
engine
=
innodb
;
alter
table
t1
comment
'123'
;
show
create
table
t1
;
drop
table
t1
;
--
echo
End
of
5.0
tests
sql/sql_table.cc
View file @
9be267cb
...
...
@@ -3776,6 +3776,9 @@ view_err:
alter_info
->
keys_onoff
);
table
->
file
->
external_lock
(
thd
,
F_UNLCK
);
VOID
(
pthread_mutex_unlock
(
&
LOCK_open
));
error
=
ha_commit_stmt
(
thd
);
if
(
ha_commit
(
thd
))
error
=
1
;
}
thd
->
last_insert_id
=
next_insert_id
;
// Needed for correct log
...
...
@@ -3946,16 +3949,6 @@ view_err:
goto
err
;
}
}
/* The ALTER TABLE is always in its own transaction */
error
=
ha_commit_stmt
(
thd
);
if
(
ha_commit
(
thd
))
error
=
1
;
if
(
error
)
{
VOID
(
pthread_mutex_unlock
(
&
LOCK_open
));
broadcast_refresh
();
goto
err
;
}
thd
->
proc_info
=
"end"
;
if
(
mysql_bin_log
.
is_open
())
{
...
...
@@ -4165,8 +4158,12 @@ copy_data_between_tables(TABLE *from,TABLE *to,
}
to
->
file
->
extra
(
HA_EXTRA_NO_IGNORE_DUP_KEY
);
ha_enable_transaction
(
thd
,
TRUE
);
if
(
ha_enable_transaction
(
thd
,
TRUE
))
{
error
=
1
;
goto
err
;
}
/*
Ensure that the new table is saved properly to disk so that we
can do a rename
...
...
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