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
1e17f242
Commit
1e17f242
authored
Jun 12, 2008
by
Georgi Kodinov
Browse files
Options
Browse Files
Download
Plain Diff
atuomatically merged 5.0 main to 5.0-bugteam
parents
15440264
dd64a86a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
4 deletions
+20
-4
configure.in
configure.in
+2
-2
mysql-test/r/federated_disabled.result
mysql-test/r/federated_disabled.result
+0
-0
mysql-test/t/federated_disabled-master.opt
mysql-test/t/federated_disabled-master.opt
+1
-0
mysql-test/t/federated_disabled.test
mysql-test/t/federated_disabled.test
+3
-0
sql/mysqld.cc
sql/mysqld.cc
+14
-2
No files found.
configure.in
View file @
1e17f242
...
...
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE
(
mysql, 5.0.6
4
)
AM_INIT_AUTOMAKE
(
mysql, 5.0.6
6
)
AM_CONFIG_HEADER
([
include/config.h:config.h.in]
)
PROTOCOL_VERSION
=
10
...
...
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# ndb version
NDB_VERSION_MAJOR
=
5
NDB_VERSION_MINOR
=
0
NDB_VERSION_BUILD
=
6
4
NDB_VERSION_BUILD
=
6
6
NDB_VERSION_STATUS
=
""
# Set all version vars based on $VERSION. How do we do this more elegant ?
...
...
mysql-test/r/federated_disabled.result
0 → 100644
View file @
1e17f242
mysql-test/t/federated_disabled-master.opt
0 → 100644
View file @
1e17f242
--skip-federated
mysql-test/t/federated_disabled.test
0 → 100644
View file @
1e17f242
source
include
/
federated
.
inc
;
SHOW
VARIABLES
LIKE
'have_federated_engine'
;
sql/mysqld.cc
View file @
1e17f242
...
...
@@ -328,7 +328,7 @@ static bool lower_case_table_names_used= 0;
static
bool
volatile
select_thread_in_use
,
signal_thread_in_use
;
static
bool
volatile
ready_to_exit
;
static
my_bool
opt_debugging
=
0
,
opt_external_locking
=
0
,
opt_console
=
0
;
static
my_bool
opt_bdb
,
opt_isam
,
opt_ndbcluster
,
opt_merge
;
static
my_bool
opt_bdb
,
opt_isam
,
opt_ndbcluster
,
opt_merge
,
opt_federated
;
static
my_bool
opt_short_log_format
=
0
;
static
uint
kill_cached_threads
,
wake_thread
;
static
ulong
killed_threads
,
thread_created
;
...
...
@@ -4989,7 +4989,8 @@ enum options_mysqld
OPT_INNODB_ROLLBACK_ON_TIMEOUT
,
OPT_SECURE_FILE_PRIV
,
OPT_KEEP_FILES_ON_CREATE
,
OPT_INNODB_ADAPTIVE_HASH_INDEX
OPT_INNODB_ADAPTIVE_HASH_INDEX
,
OPT_FEDERATED
};
...
...
@@ -5175,6 +5176,9 @@ Disable with --skip-external-locking.",
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"flush"
,
OPT_FLUSH
,
"Flush tables to disk between SQL commands."
,
0
,
0
,
0
,
GET_NO_ARG
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"federated"
,
OPT_FEDERATED
,
"Enable Federated storage engine. Disable with \
--skip-federated."
,
(
gptr
*
)
&
opt_federated
,
(
gptr
*
)
&
opt_federated
,
0
,
GET_BOOL
,
NO_ARG
,
1
,
0
,
0
,
0
,
0
,
0
},
/* We must always support the next option to make scripts like mysqltest
easier to do */
{
"gdb"
,
OPT_DEBUGGING
,
...
...
@@ -7322,6 +7326,14 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
else
have_merge_db
=
SHOW_OPTION_DISABLED
;
break
;
#ifdef HAVE_FEDERATED_DB
case
OPT_FEDERATED
:
if
(
opt_federated
)
have_federated_db
=
SHOW_OPTION_YES
;
else
have_federated_db
=
SHOW_OPTION_DISABLED
;
break
;
#endif
#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