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
06631572
Commit
06631572
authored
Sep 12, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b12917
parents
acc769f5
44619bb9
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
1 deletion
+27
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+6
-0
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+3
-1
mysql-test/r/mysqldump.result
mysql-test/r/mysqldump.result
+2
-0
mysql-test/t/mysqldump.test
mysql-test/t/mysqldump.test
+13
-0
mysys/default.c
mysys/default.c
+3
-0
No files found.
mysql-test/mysql-test-run.pl
View file @
06631572
...
...
@@ -179,6 +179,7 @@ our $exe_mysql_fix_system_tables;
our
$exe_mysqltest
;
our
$exe_slave_mysqld
;
our
$exe_im
;
our
$exe_my_print_defaults
;
our
$opt_bench
=
0
;
our
$opt_small_bench
=
0
;
...
...
@@ -872,6 +873,8 @@ sub executable_setup () {
$exe_mysql
=
mtr_exe_exists
("
$path_client_bindir
/mysql
");
$exe_mysql_fix_system_tables
=
mtr_script_exists
("
$glob_basedir
/scripts/mysql_fix_privilege_tables
");
$exe_my_print_defaults
=
mtr_script_exists
("
$glob_basedir
/extra/my_print_defaults
");
$path_ndb_tools_dir
=
mtr_path_exists
("
$glob_basedir
/ndb/tools
");
$exe_ndb_mgm
=
"
$glob_basedir
/ndb/src/mgmclient/ndb_mgm
";
}
...
...
@@ -887,6 +890,8 @@ sub executable_setup () {
$exe_mysql_fix_system_tables
=
mtr_script_exists
("
$path_client_bindir
/mysql_fix_privilege_tables
",
"
$glob_basedir
/scripts/mysql_fix_privilege_tables
");
$exe_my_print_defaults
=
mtr_script_exists
("
path_client_bindir/my_print_defaults
");
$path_language
=
mtr_path_exists
("
$glob_basedir
/share/mysql/english/
",
"
$glob_basedir
/share/english/
");
...
...
@@ -2384,6 +2389,7 @@ sub run_mysqltest ($) {
$ENV
{'
MYSQL_FIX_SYSTEM_TABLES
'}
=
$cmdline_mysql_fix_system_tables
;
$ENV
{'
MYSQL_CLIENT_TEST
'}
=
$cmdline_mysql_client_test
;
$ENV
{'
CHARSETSDIR
'}
=
$path_charsetsdir
;
$ENV
{'
MYSQL_MY_PRINT_DEFAULTS
'}
=
$exe_my_print_defaults
;
$ENV
{'
NDB_STATUS_OK
'}
=
$flag_ndb_status_ok
;
$ENV
{'
NDB_MGM
'}
=
$exe_ndb_mgm
;
...
...
mysql-test/mysql-test-run.sh
View file @
06631572
...
...
@@ -575,6 +575,7 @@ if [ x$SOURCE_DIST = x1 ] ; then
CLIENT_BINDIR
=
"
$BASEDIR
/client"
MYSQLADMIN
=
"
$CLIENT_BINDIR
/mysqladmin"
WAIT_PID
=
"
$BASEDIR
/extra/mysql_waitpid"
MYSQL_MY_PRINT_DEFAULTS
=
"
$BASEDIR
/extra/my_print_defaults"
MYSQL_MANAGER_CLIENT
=
"
$CLIENT_BINDIR
/mysqltestmanagerc"
MYSQL_MANAGER
=
"
$BASEDIR
/tools/mysqltestmanager"
MYSQL_MANAGER_PWGEN
=
"
$CLIENT_BINDIR
/mysqltestmanager-pwgen"
...
...
@@ -635,6 +636,7 @@ else
MYSQL_BINLOG
=
"
$CLIENT_BINDIR
/mysqlbinlog"
MYSQLADMIN
=
"
$CLIENT_BINDIR
/mysqladmin"
WAIT_PID
=
"
$CLIENT_BINDIR
/mysql_waitpid"
MYSQL_MY_PRINT_DEFAULTS
=
"
$CLIENT_BINDIR
/my_print_defaults"
MYSQL_MANAGER
=
"
$CLIENT_BINDIR
/mysqltestmanager"
MYSQL_MANAGER_CLIENT
=
"
$CLIENT_BINDIR
/mysqltestmanagerc"
MYSQL_MANAGER_PWGEN
=
"
$CLIENT_BINDIR
/mysqltestmanager-pwgen"
...
...
@@ -716,7 +718,7 @@ MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR --charact
MYSQL_FIX_SYSTEM_TABLES
=
"
$MYSQL_FIX_SYSTEM_TABLES
--no-defaults --host=localhost --port=
$MASTER_MYPORT
--socket=
$MASTER_MYSOCK
--user=root --password=
$DBPASSWD
--basedir=
$BASEDIR
--bindir=
$CLIENT_BINDIR
--verbose"
MYSQL
=
"
$MYSQL
--no-defaults --host=localhost --port=
$MASTER_MYPORT
--socket=
$MASTER_MYSOCK
--user=root --password=
$DBPASSWD
"
export
MYSQL MYSQL_DUMP MYSQL_SHOW MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES
export
CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR
export
CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR
MYSQL_MY_PRINT_DEFAULTS
export
NDB_TOOLS_DIR
export
NDB_MGM
export
NDB_BACKUP_DIR
...
...
mysql-test/r/mysqldump.result
View file @
06631572
...
...
@@ -1875,6 +1875,8 @@ set @fired:= "No";
end if;
end BEFORE # STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
DROP TABLE t1, t2;
--port=1234
--port=1234
DROP TABLE IF EXISTS `test1`;
Warnings:
Note 1051 Unknown table 'test1'
...
...
mysql-test/t/mysqldump.test
View file @
06631572
...
...
@@ -762,7 +762,20 @@ show tables;
show
triggers
;
DROP
TABLE
t1
,
t2
;
#
# Bugs #9136, #12917: problems with --defaults-extra-file option
#
--
exec
echo
"[client]"
>
$MYSQL_TEST_DIR
/
var
/
tmp
/
tmp
.
cnf
--
exec
echo
"port=1234"
>>
$MYSQL_TEST_DIR
/
var
/
tmp
/
tmp
.
cnf
--
exec
$MYSQL_MY_PRINT_DEFAULTS
-
c
$MYSQL_TEST_DIR
/
var
/
tmp
/
tmp
.
cnf
client
--
exec
$MYSQL_MY_PRINT_DEFAULTS
-
e
$MYSQL_TEST_DIR
/
var
/
tmp
/
tmp
.
cnf
client
--
exec
rm
$MYSQL_TEST_DIR
/
var
/
tmp
/
tmp
.
cnf
#
# Test of fix to BUG 12597
#
DROP
TABLE
IF
EXISTS
`test1`
;
CREATE
TABLE
`test1`
(
`a1`
int
(
11
)
default
NULL
...
...
mysys/default.c
View file @
06631572
...
...
@@ -137,6 +137,9 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv,
if
(
!
defaults_group_suffix
)
defaults_group_suffix
=
getenv
(
STRINGIFY_ARG
(
DEFAULT_GROUP_SUFFIX_ENV
));
if
(
forced_extra_defaults
)
defaults_extra_file
=
forced_extra_defaults
;
/*
We can only handle 'defaults-group-suffix' if we are called from
load_defaults() as otherwise we can't know the type of 'func_ctx'
...
...
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