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
24f96519
Commit
24f96519
authored
Jul 20, 2006
by
tsmith/tim@siva.hindu.god
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Finish the merge of the patch for bug #15195 from 4.1 -> 5.0
- Adapt it to work with the handlerton class
parent
17cc8acc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
sql/handler.cc
sql/handler.cc
+3
-1
sql/mysql_priv.h
sql/mysql_priv.h
+4
-1
sql/mysqld.cc
sql/mysqld.cc
+5
-0
No files found.
sql/handler.cc
View file @
24f96519
...
...
@@ -302,7 +302,9 @@ handler *get_new_handler(TABLE *table, MEM_ROOT *alloc, enum db_type db_type)
#endif
case
DB_TYPE_MRG_MYISAM
:
case
DB_TYPE_MRG_ISAM
:
if
(
have_merge_db
==
SHOW_OPTION_YES
)
return
new
(
alloc
)
ha_myisammrg
(
table
);
return
NULL
;
#ifdef HAVE_BERKELEY_DB
case
DB_TYPE_BERKELEY_DB
:
if
(
have_berkeley_db
==
SHOW_OPTION_YES
)
...
...
sql/mysql_priv.h
View file @
24f96519
...
...
@@ -1323,8 +1323,11 @@ extern handlerton ndbcluster_hton;
extern
SHOW_COMP_OPTION
have_ndbcluster
;
#endif
/* MRG_MYISAM handler is always built, but may be skipped */
extern
handlerton
myisammrg_hton
;
#define have_merge_db myisammrg_hton.state
extern
SHOW_COMP_OPTION
have_isam
;
extern
SHOW_COMP_OPTION
have_merge_db
;
extern
SHOW_COMP_OPTION
have_raid
,
have_openssl
,
have_symlink
,
have_dlopen
;
extern
SHOW_COMP_OPTION
have_query_cache
;
extern
SHOW_COMP_OPTION
have_geometry
,
have_rtree_keys
;
...
...
sql/mysqld.cc
View file @
24f96519
...
...
@@ -6887,6 +6887,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
global_system_variables
.
tx_isolation
=
(
type
-
1
);
break
;
}
case
OPT_MERGE
:
if
(
opt_merge
)
have_merge_db
=
SHOW_OPTION_YES
;
else
have_merge_db
=
SHOW_OPTION_DISABLED
;
#ifdef HAVE_BERKELEY_DB
case
OPT_BDB_NOSYNC
:
/* Deprecated option */
...
...
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