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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
dfaa3c78
Commit
dfaa3c78
authored
Jul 10, 2006
by
ingo/mydev@chilla.local
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revoking patch for Bug#10952 on behalf of Brian.
parent
be5f4826
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
3 additions
and
44 deletions
+3
-44
mysql-test/r/blackhole.result
mysql-test/r/blackhole.result
+0
-8
mysql-test/r/merge.result
mysql-test/r/merge.result
+0
-8
mysql-test/t/blackhole.test
mysql-test/t/blackhole.test
+0
-12
mysql-test/t/merge.test
mysql-test/t/merge.test
+0
-10
sql/ha_blackhole.cc
sql/ha_blackhole.cc
+1
-1
sql/ha_myisammrg.cc
sql/ha_myisammrg.cc
+1
-1
sql/handler.h
sql/handler.h
+0
-1
sql/sql_table.cc
sql/sql_table.cc
+1
-3
No files found.
mysql-test/r/blackhole.result
View file @
dfaa3c78
...
...
@@ -123,11 +123,3 @@ master-bin.000001 # Query 1 # use `test`; create table t3 like t1
master-bin.000001 # Query 1 # use `test`; insert into t1 select * from t3
master-bin.000001 # Query 1 # use `test`; replace into t1 select * from t3
drop table t1,t2,t3;
drop table if exists t1;
Warnings:
Note 1051 Unknown table 't1'
create table t1 (c char(20)) engine=MyISAM;
insert into t1 values ("Monty"),("WAX"),("Walrus");
alter table t1 engine=blackhole;
ERROR HY000: Table storage engine for 't1' doesn't have this option
drop table t1;
mysql-test/r/merge.result
View file @
dfaa3c78
...
...
@@ -768,14 +768,6 @@ Table Op Msg_type Msg_text
test.t1 check status OK
test.t2 check status OK
drop table t1, t2, t3;
drop table if exists t1;
Warnings:
Note 1051 Unknown table 't1'
create table t1 (c char(20)) engine=MyISAM;
insert into t1 values ("Monty"),("WAX"),("Walrus");
alter table t1 engine=MERGE;
ERROR HY000: Table storage engine for 't1' doesn't have this option
drop table t1;
create table t1 (b bit(1));
create table t2 (b bit(1));
create table tm (b bit(1)) engine = merge union = (t1,t2);
...
...
mysql-test/t/blackhole.test
View file @
dfaa3c78
...
...
@@ -128,15 +128,3 @@ show binlog events;
drop
table
t1
,
t2
,
t3
;
# End of 4.1 tests
#
# BUG#10952 - alter table ... lost data without errors and warnings
#
drop
table
if
exists
t1
;
create
table
t1
(
c
char
(
20
))
engine
=
MyISAM
;
insert
into
t1
values
(
"Monty"
),(
"WAX"
),(
"Walrus"
);
--
error
1031
alter
table
t1
engine
=
blackhole
;
drop
table
t1
;
# End of 5.0 tests
mysql-test/t/merge.test
View file @
dfaa3c78
...
...
@@ -380,16 +380,6 @@ drop table t1, t2, t3;
# End of 4.1 tests
#
# BUG#10952 - alter table ... lost data without errors and warnings
#
drop
table
if
exists
t1
;
create
table
t1
(
c
char
(
20
))
engine
=
MyISAM
;
insert
into
t1
values
(
"Monty"
),(
"WAX"
),(
"Walrus"
);
--
error
1031
alter
table
t1
engine
=
MERGE
;
drop
table
t1
;
#
# BUG#19648 - Merge table does not work with bit types
#
...
...
sql/ha_blackhole.cc
View file @
dfaa3c78
...
...
@@ -47,7 +47,7 @@ handlerton blackhole_hton= {
NULL
,
/* create_cursor_read_view */
NULL
,
/* set_cursor_read_view */
NULL
,
/* close_cursor_read_view */
HTON_CAN_RECREATE
|
HTON_ALTER_CANNOT_CREATE
HTON_CAN_RECREATE
};
/*****************************************************************************
...
...
sql/ha_myisammrg.cc
View file @
dfaa3c78
...
...
@@ -55,7 +55,7 @@ handlerton myisammrg_hton= {
NULL
,
/* create_cursor_read_view */
NULL
,
/* set_cursor_read_view */
NULL
,
/* close_cursor_read_view */
HTON_CAN_RECREATE
|
HTON_ALTER_CANNOT_CREATE
HTON_CAN_RECREATE
};
...
...
sql/handler.h
View file @
dfaa3c78
...
...
@@ -410,7 +410,6 @@ struct show_table_alias_st {
#define HTON_ALTER_NOT_SUPPORTED (1 << 1) //Engine does not support alter
#define HTON_CAN_RECREATE (1 << 2) //Delete all is used fro truncate
#define HTON_HIDDEN (1 << 3) //Engine does not appear in lists
#define HTON_ALTER_CANNOT_CREATE (1 << 4) //Cannot use alter to create
typedef
struct
st_thd_trans
{
...
...
sql/sql_table.cc
View file @
dfaa3c78
...
...
@@ -3240,9 +3240,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
DBUG_PRINT
(
"info"
,
(
"old type: %d new type: %d"
,
old_db_type
,
new_db_type
));
if
(
ha_check_storage_engine_flag
(
old_db_type
,
HTON_ALTER_NOT_SUPPORTED
)
||
ha_check_storage_engine_flag
(
new_db_type
,
HTON_ALTER_NOT_SUPPORTED
)
||
(
old_db_type
!=
new_db_type
&&
ha_check_storage_engine_flag
(
new_db_type
,
HTON_ALTER_CANNOT_CREATE
)))
ha_check_storage_engine_flag
(
new_db_type
,
HTON_ALTER_NOT_SUPPORTED
))
{
DBUG_PRINT
(
"info"
,
(
"doesn't support alter"
));
my_error
(
ER_ILLEGAL_HA
,
MYF
(
0
),
table_name
);
...
...
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