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
9c41b35b
Commit
9c41b35b
authored
Jun 01, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-8220 Server crashes if started with --enforce-storage-engine option
parent
d6025745
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
0 deletions
+24
-0
mysql-test/r/enforce_storage_engine_opt.result
mysql-test/r/enforce_storage_engine_opt.result
+14
-0
mysql-test/t/enforce_storage_engine_opt.opt
mysql-test/t/enforce_storage_engine_opt.opt
+1
-0
mysql-test/t/enforce_storage_engine_opt.test
mysql-test/t/enforce_storage_engine_opt.test
+6
-0
sql/sql_plugin.cc
sql/sql_plugin.cc
+3
-0
No files found.
mysql-test/r/enforce_storage_engine_opt.result
0 → 100644
View file @
9c41b35b
create table t1 (c1 int primary key auto_increment, c2 varchar(10)) engine=memory;
Warnings:
Note 1266 Using storage engine MyISAM for table 't1'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL AUTO_INCREMENT,
`c2` varchar(10) DEFAULT NULL,
PRIMARY KEY (`c1`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
set session sql_mode='no_engine_substitution';
create table t2 (c1 int primary key auto_increment, c2 varchar(10)) engine=memory;
ERROR 42000: Unknown storage engine 'MEMORY'
drop table t1;
mysql-test/t/enforce_storage_engine_opt.opt
0 → 100644
View file @
9c41b35b
--enforce-storage-engine=myisam
mysql-test/t/enforce_storage_engine_opt.test
0 → 100644
View file @
9c41b35b
create
table
t1
(
c1
int
primary
key
auto_increment
,
c2
varchar
(
10
))
engine
=
memory
;
show
create
table
t1
;
set
session
sql_mode
=
'no_engine_substitution'
;
--
error
1286
create
table
t2
(
c1
int
primary
key
auto_increment
,
c2
varchar
(
10
))
engine
=
memory
;
drop
table
t1
;
sql/sql_plugin.cc
View file @
9c41b35b
...
@@ -3107,6 +3107,9 @@ void plugin_thdvar_init(THD *thd)
...
@@ -3107,6 +3107,9 @@ void plugin_thdvar_init(THD *thd)
if
(
global_system_variables
.
tmp_table_plugin
)
if
(
global_system_variables
.
tmp_table_plugin
)
thd
->
variables
.
tmp_table_plugin
=
thd
->
variables
.
tmp_table_plugin
=
intern_plugin_lock
(
NULL
,
global_system_variables
.
tmp_table_plugin
);
intern_plugin_lock
(
NULL
,
global_system_variables
.
tmp_table_plugin
);
if
(
global_system_variables
.
enforced_table_plugin
)
thd
->
variables
.
enforced_table_plugin
=
intern_plugin_lock
(
NULL
,
global_system_variables
.
enforced_table_plugin
);
intern_plugin_unlock
(
NULL
,
old_table_plugin
);
intern_plugin_unlock
(
NULL
,
old_table_plugin
);
intern_plugin_unlock
(
NULL
,
old_tmp_table_plugin
);
intern_plugin_unlock
(
NULL
,
old_tmp_table_plugin
);
intern_plugin_unlock
(
NULL
,
old_enforced_table_plugin
);
intern_plugin_unlock
(
NULL
,
old_enforced_table_plugin
);
...
...
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