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
41659299
Commit
41659299
authored
16 years ago
by
Mattias Jonsson
Browse files
Options
Browse Files
Download
Plain Diff
auto merge
parents
3345a715
f20f1a3c
Branches unavailable
Tags unavailable
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
7 deletions
+17
-7
mysql-test/Makefile.am
mysql-test/Makefile.am
+5
-5
mysql-test/lib/mtr_cases.pl
mysql-test/lib/mtr_cases.pl
+9
-0
sql/sql_plugin.cc
sql/sql_plugin.cc
+3
-2
No files found.
mysql-test/Makefile.am
View file @
41659299
...
...
@@ -35,8 +35,8 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I..
dist-hook
:
mkdir
-p
\
$(distdir)
/t
\
$(distdir)
/extra/binlog_tests
\
$(distdir)
/extra/rpl_tests
\
$(distdir)
/extra/binlog_tests
\
$(distdir)
/extra/rpl_tests
\
$(distdir)
/r
\
$(distdir)
/include
\
$(distdir)
/std_data
\
...
...
@@ -46,7 +46,7 @@ dist-hook:
$(distdir)
/std_data/ndb_backup51_data_le
\
$(distdir)
/std_data/parts
\
$(distdir)
/lib
\
$(distdir)
/std_data/funcs_1
\
$(distdir)
/std_data/funcs_1
\
$(distdir)
/lib/My
-
$(INSTALL_DATA)
$(srcdir)
/t/
*
.def
$(distdir)
/t
$(INSTALL_DATA)
$(srcdir)
/t/
*
.test
$(distdir)
/t
...
...
@@ -77,7 +77,7 @@ dist-hook:
$(INSTALL_DATA)
$(srcdir)
/std_data/ndb_backup51_data_be/BACKUP
*
$(distdir)
/std_data/ndb_backup51_data_be
$(INSTALL_DATA)
$(srcdir)
/std_data/ndb_backup51_data_le/BACKUP
*
$(distdir)
/std_data/ndb_backup51_data_le
$(INSTALL_DATA)
$(srcdir)
/std_data/parts/part_
*
$(distdir)
/std_data/parts
$(INSTALL_DATA)
$(srcdir)
/std_data/funcs_1/
*
.txt
$(distdir)
/std_data/funcs_1
$(INSTALL_DATA)
$(srcdir)
/std_data/funcs_1/
*
$(distdir)
/std_data/funcs_1
$(INSTALL_DATA)
$(srcdir)
/lib/
*
.pl
$(distdir)
/lib
$(INSTALL_DATA)
$(srcdir)
/lib/My/
*
.pm
$(distdir)
/lib/My
-
rm
-rf
`
find
$(distdir)
/suite
-type
d
-name
SCCS
`
$(distdir)
/suite/row_lock
...
...
@@ -132,7 +132,7 @@ install-data-local:
$(INSTALL_DATA)
$(srcdir)
/std_data/ndb_backup51_data_be/BACKUP
*
$(DESTDIR)$(testdir)
/std_data/ndb_backup51_data_be
$(INSTALL_DATA)
$(srcdir)
/std_data/ndb_backup51_data_le/BACKUP
*
$(DESTDIR)$(testdir)
/std_data/ndb_backup51_data_le
$(INSTALL_DATA)
$(srcdir)
/std_data/parts/part_
*
$(DESTDIR)$(testdir)
/std_data/parts
$(INSTALL_DATA)
$(srcdir)
/std_data/funcs_1/
*
.txt
$(DESTDIR)$(testdir)
/std_data/funcs_1
$(INSTALL_DATA)
$(srcdir)
/std_data/funcs_1/
*
$(DESTDIR)$(testdir)
/std_data/funcs_1
$(INSTALL_DATA)
$(srcdir)
/lib/
*
.pl
$(DESTDIR)$(testdir)
/lib
$(INSTALL_DATA)
$(srcdir)
/lib/My/
*
.pm
$(DESTDIR)$(testdir)
/lib/My
for
f
in
`
(
cd
$(srcdir)
;
find suite
-type
f | egrep
-v
'SCCS|row_lock'
)
`
;
\
...
...
This diff is collapsed.
Click to expand it.
mysql-test/lib/mtr_cases.pl
View file @
41659299
...
...
@@ -773,6 +773,13 @@ sub collect_one_test_case($$$$$$$$$) {
if
(
$::used_default_engine
=~
/^innodb/i
);
}
#enable federated for this test
if
(
$tinfo
->
{'
federated_test
'})
{
push
(
@
{
$tinfo
->
{'
master_opt
'}},
"
--loose-federated
");
push
(
@
{
$tinfo
->
{'
slave_opt
'}},
"
--loose-federated
");
}
if
(
$tinfo
->
{'
big_test
'}
and
!
$::opt_big_test
)
{
$tinfo
->
{'
skip
'}
=
1
;
...
...
@@ -891,6 +898,8 @@ our @tags=
["
include/have_ndb_extra.inc
",
"
ndb_extra
",
1
],
["
include/ndb_master-slave.inc
",
"
ndb_test
",
1
],
["
require_manager
",
"
require_manager
",
1
],
["
include/federated.inc
",
"
federated_test
",
1
],
["
include/have_federated_db.inc
",
"
federated_test
",
1
],
);
sub
mtr_options_from_test_file
($$)
{
...
...
This diff is collapsed.
Click to expand it.
sql/sql_plugin.cc
View file @
41659299
...
...
@@ -1137,9 +1137,10 @@ int plugin_init(int *argc, char **argv, int flags)
{
for
(
plugin
=
*
builtins
;
plugin
->
info
;
plugin
++
)
{
/* by default,
only ndbcluster is
disabled */
/* by default,
ndbcluster and federated are
disabled */
def_enabled
=
my_strcasecmp
(
&
my_charset_latin1
,
plugin
->
name
,
"NDBCLUSTER"
)
!=
0
;
my_strcasecmp
(
&
my_charset_latin1
,
plugin
->
name
,
"NDBCLUSTER"
)
!=
0
&&
my_strcasecmp
(
&
my_charset_latin1
,
plugin
->
name
,
"FEDERATED"
)
!=
0
;
bzero
(
&
tmp
,
sizeof
(
tmp
));
tmp
.
plugin
=
plugin
;
tmp
.
name
.
str
=
(
char
*
)
plugin
->
name
;
...
...
This diff is collapsed.
Click to expand it.
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