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
1668c45d
Commit
1668c45d
authored
Aug 29, 2005
by
andrey@lmy004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for bug 12207 (alter table discard tablespace on MyISAM table
causes ERROR 2013). (all-in-one approved patch)
parent
d7d307fb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
+15
-3
mysql-test/r/alter_table.result
mysql-test/r/alter_table.result
+4
-0
mysql-test/t/alter_table.test
mysql-test/t/alter_table.test
+8
-0
sql/sql_table.cc
sql/sql_table.cc
+3
-3
No files found.
mysql-test/r/alter_table.result
View file @
1668c45d
...
@@ -523,6 +523,10 @@ alter table t1 drop key no_such_key;
...
@@ -523,6 +523,10 @@ alter table t1 drop key no_such_key;
ERROR 42000: Can't DROP 'no_such_key'; check that column/key exists
ERROR 42000: Can't DROP 'no_such_key'; check that column/key exists
alter table t1 drop key a;
alter table t1 drop key a;
drop table t1;
drop table t1;
CREATE TABLE T12207(a int) ENGINE=MYISAM;
ALTER TABLE T12207 DISCARD TABLESPACE;
ERROR HY000: Table storage engine for 'T12207' doesn't have this option
DROP TABLE T12207;
create table t1 (a text) character set koi8r;
create table t1 (a text) character set koi8r;
insert into t1 values (_koi8r'');
insert into t1 values (_koi8r'');
select hex(a) from t1;
select hex(a) from t1;
...
...
mysql-test/t/alter_table.test
View file @
1668c45d
...
@@ -337,6 +337,14 @@ alter table t1 drop key no_such_key;
...
@@ -337,6 +337,14 @@ alter table t1 drop key no_such_key;
alter
table
t1
drop
key
a
;
alter
table
t1
drop
key
a
;
drop
table
t1
;
drop
table
t1
;
#
# BUG 12207 alter table ... discard table space on MyISAM table causes ERROR 2013 (HY000)
#
CREATE
TABLE
T12207
(
a
int
)
ENGINE
=
MYISAM
;
--
error
1031
ALTER
TABLE
T12207
DISCARD
TABLESPACE
;
DROP
TABLE
T12207
;
#
#
# Bug #6479 ALTER TABLE ... changing charset fails for TEXT columns
# Bug #6479 ALTER TABLE ... changing charset fails for TEXT columns
#
#
...
...
sql/sql_table.cc
View file @
1668c45d
...
@@ -2820,15 +2820,15 @@ mysql_discard_or_import_tablespace(THD *thd,
...
@@ -2820,15 +2820,15 @@ mysql_discard_or_import_tablespace(THD *thd,
err:
err:
close_thread_tables
(
thd
);
close_thread_tables
(
thd
);
thd
->
tablespace_op
=
FALSE
;
thd
->
tablespace_op
=
FALSE
;
if
(
error
==
0
)
if
(
error
==
0
)
{
{
send_ok
(
thd
);
send_ok
(
thd
);
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
}
if
(
error
==
HA_ERR_ROW_IS_REFERENCED
)
table
->
file
->
print_error
(
error
,
MYF
(
0
));
my_error
(
ER_ROW_IS_REFERENCED
,
MYF
(
0
));
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
}
}
...
...
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