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
071a14c9
Commit
071a14c9
authored
Aug 06, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: remove have_mysql_upgrade.inc
parent
15a9103c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
24 deletions
+3
-24
mysql-test/include/have_mysql_upgrade.inc
mysql-test/include/have_mysql_upgrade.inc
+0
-4
mysql-test/include/mysql_upgrade_preparation.inc
mysql-test/include/mysql_upgrade_preparation.inc
+0
-7
mysql-test/r/have_mysql_upgrade.result
mysql-test/r/have_mysql_upgrade.result
+0
-2
mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
+2
-4
mysql-test/t/log_tables_upgrade.test
mysql-test/t/log_tables_upgrade.test
+1
-7
No files found.
mysql-test/include/have_mysql_upgrade.inc
deleted
100644 → 0
View file @
15a9103c
--
require
r
/
have_mysql_upgrade
.
result
--
disable_query_log
select
LENGTH
(
"
$MYSQL_UPGRADE
"
)
>
0
as
have_mysql_upgrade
;
--
enable_query_log
mysql-test/include/mysql_upgrade_preparation.inc
View file @
071a14c9
...
@@ -2,13 +2,6 @@
...
@@ -2,13 +2,6 @@
# Can't run test of external client with embedded server
# Can't run test of external client with embedded server
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
# Only run test if "mysql_upgrade" is found
--
require
r
/
have_mysql_upgrade
.
result
--
disable_query_log
select
LENGTH
(
"
$MYSQL_UPGRADE
"
)
>
0
as
have_mysql_upgrade
;
--
enable_query_log
#
#
# Hack:
# Hack:
#
#
...
...
mysql-test/r/have_mysql_upgrade.result
deleted
100644 → 0
View file @
15a9103c
have_mysql_upgrade
1
mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
View file @
071a14c9
...
@@ -5,11 +5,9 @@
...
@@ -5,11 +5,9 @@
# options are added into mysql_upgrade. These options control whether sql
# options are added into mysql_upgrade. These options control whether sql
# statements are binlogged or not.
# statements are binlogged or not.
#############################################################################
#############################################################################
--
source
include
/
master
-
slave
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
mysql_upgrade_preparation
.
inc
# Only run test if "mysql_upgrade" is found
--
source
include
/
master
-
slave
.
inc
--
source
include
/
have_mysql_upgrade
.
inc
call
mtr
.
add_suppression
(
"Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"
);
call
mtr
.
add_suppression
(
"Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"
);
call
mtr
.
add_suppression
(
"table or database name 'mysqltest-1'"
);
call
mtr
.
add_suppression
(
"table or database name 'mysqltest-1'"
);
...
...
mysql-test/t/log_tables_upgrade.test
View file @
071a14c9
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_csv
.
inc
--
source
include
/
have_csv
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
mysql_upgrade_preparation
.
inc
# Only run test if "mysql_upgrade" is found
--
require
r
/
have_mysql_upgrade
.
result
--
disable_query_log
select
LENGTH
(
"
$MYSQL_UPGRADE
"
)
>
0
as
have_mysql_upgrade
;
--
enable_query_log
--
echo
#
--
echo
#
--
echo
# Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULL
--
echo
# Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULL
...
...
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