Skip to content
GitLab
Commit 72a8f92d authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Updated changelog and refreshed patches after 10.0.21 import

parent 979b06ce
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ 72a8f92d
mariadb-10.0 (10.0.20-4) UNRELEASED; urgency=low mariadb-10.0 (10.0.21-1) UNRELEASED; urgency=low
[ Otto Kekäläinen ] [ Otto Kekäläinen ]
* Created libmariadbd and moved .so file from libmariadbd-dev there * Created libmariadbd and moved .so file from libmariadbd-dev there
* Reproducible build improvement: Add LC_ALL=C to mysql.sym sort command * Reproducible build improvement: Add LC_ALL=C to mysql.sym sort command
* New upstream release.
- Add skip_log_error to mysqld_safe config as done in upstream
[ Jean Weisbuch ] [ Jean Weisbuch ]
* The MYCHECK_RCPT variable can now be set from the default file. * The MYCHECK_RCPT variable can now be set from the default file.
......
debian/patches/mysql-test__db_test.patch
View file @ 72a8f92d
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
## DP: suite depends on them. ## DP: suite depends on them.
--- old/mysql-test/mysql-test-run.pl 2009-06-16 14:24:09.000000000 +0200 --- old/mysql-test/mysql-test-run.pl 2009-06-16 14:24:09.000000000 +0200
+++ new/mysql-test/mysql-test-run.pl 2009-07-04 00:03:34.000000000 +0200 +++ new/mysql-test/mysql-test-run.pl 2009-07-04 00:03:34.000000000 +0200
@@ -3602,6 +3602,11 @@ sub mysql_install_db { @@ -3605,6 +3605,11 @@ sub mysql_install_db {
mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql", mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
$bootstrap_sql_file); $bootstrap_sql_file);
......
debian/patches/remove_rename_mariadb-server_files_in.patch
View file @ 72a8f92d
...@@ -3,7 +3,7 @@ Description: Remove upstream debian/* handling that is obsolete ...@@ -3,7 +3,7 @@ Description: Remove upstream debian/* handling that is obsolete
--- old/CMakeLists.txt 2014-01-29 20:55:56.499842093 +0200 --- old/CMakeLists.txt 2014-01-29 20:55:56.499842093 +0200
+++ new/CMakeLists.txt 2014-01-31 17:12:27.633594128 +0200 +++ new/CMakeLists.txt 2014-01-31 17:12:27.633594128 +0200
@@ -460,12 +460,6 @@ CONFIGURE_FILE( @@ -458,12 +458,6 @@ CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY) ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
......
debian/patches/scripts__mysqld_safe.sh__signals.patch
View file @ 72a8f92d
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
--- a/scripts/mysqld_safe.sh 2013-01-11 16:02:41 +0000 --- a/scripts/mysqld_safe.sh 2013-01-11 16:02:41 +0000
+++ b/scripts/mysqld_safe.sh 2013-01-11 16:03:14 +0000 +++ b/scripts/mysqld_safe.sh 2013-01-11 16:03:14 +0000
@@ -33,7 +33,6 @@ err_log= @@ -34,7 +34,6 @@ err_log=
syslog_tag_mysqld=mysqld syslog_tag_mysqld=mysqld
syslog_tag_mysqld_safe=mysqld_safe syslog_tag_mysqld_safe=mysqld_safe
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# MySQL-specific environment variable. First off, it's not really a umask, # MySQL-specific environment variable. First off, it's not really a umask,
# it's the desired mode. Second, it follows umask(2), not umask(3) in that # it's the desired mode. Second, it follows umask(2), not umask(3) in that
@@ -164,7 +163,7 @@ eval_log_error () { @@ -165,7 +164,7 @@ eval_log_error () {
# sed buffers output (only GNU sed supports a -u (unbuffered) option) # sed buffers output (only GNU sed supports a -u (unbuffered) option)
# which means that messages may not get sent to syslog until the # which means that messages may not get sent to syslog until the
# mysqld process quits. # mysqld process quits.
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
;; ;;
*) *)
echo "Internal program error (non-fatal):" \ echo "Internal program error (non-fatal):" \
@@ -806,6 +805,13 @@ then @@ -819,6 +818,13 @@ then
fi fi
# #
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment