diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-29 19:00:43 -0500 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-29 19:00:43 -0500 |
commit | ecc2c96c9d9b0fb5d94a1203d3ffa1a2d6c036b7 (patch) | |
tree | 3798790cf0141d8074a1c935dd9d7a9c644de0e4 /debian | |
parent | d2c72da610074afe95959094a11f95b29a741f29 (diff) | |
parent | 6b6d40fa6ca1fe36f2a51c2723c58dfb3fc025bb (diff) | |
download | mariadb-git-ecc2c96c9d9b0fb5d94a1203d3ffa1a2d6c036b7.tar.gz |
Merge of maria/5.5 into maria-5.5-galera.
bzr merge -r tag:mariadb-5.5.35 maria/5.5
Diffstat (limited to 'debian')
-rw-r--r-- | debian/dist/Debian/control | 172 | ||||
-rw-r--r-- | debian/dist/Ubuntu/control | 166 | ||||
-rwxr-xr-x | debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch | 10 | ||||
-rwxr-xr-x | debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch | 6 | ||||
-rwxr-xr-x | debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch | 4 | ||||
-rwxr-xr-x | debian/patches/44_scripts__mysql_config__libs.dpatch | 2 | ||||
-rwxr-xr-x | debian/patches/50_mysql-test__db_test.dpatch | 4 |
7 files changed, 351 insertions, 13 deletions
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index cf10e8e2daf..6d692773abb 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -10,6 +10,178 @@ Homepage: http://mariadb.org/ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files Vcs-Bzr: bzr://lp:maria +Package: libmariadbclient18 +Section: libs +Architecture: any +Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), + mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3 +Description: MariaDB database client library + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the client library. + +Package: libmysqlclient18 +Section: libs +Architecture: any +Depends: libmariadbclient18 (= ${source:Version}) +Replaces: libmysqlclient18 (<< ${source:Version}) +Description: Virtual package to satisfy external depends + This is an empty package that provides an updated "best" version of + libmysqlclient18 that does not conflict with the libmariadbclient18 + package. + . + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + +Package: libmariadbd-dev +Architecture: any +Section: libdevel +Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends} +Provides: libmysqld-dev +Conflicts: libmysqld-dev +Replaces: libmysqld-dev +Description: MariaDB embedded database development files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the embedded server library and header files. + +Package: libmariadbclient-dev +Architecture: any +Section: libdevel +Depends: libmariadbclient18 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends} +Replaces: libmariadbclient16-dev, libmysqlclient16-dev +Conflicts: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev +Provides: libmysqlclient-dev +Description: MariaDB database development files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes development libraries and header files. + +Package: mysql-common +Section: database +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes files needed by all versions of the client library + (e.g. /etc/mysql/my.cnf). + +Package: mariadb-common +Section: database +Architecture: all +Depends: mysql-common, ${shlibs:Depends}, ${misc:Depends} +Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes files needed by all versions of the client library + (e.g. /etc/mysql/conf.d/mariadb.cnf). + +Package: mariadb-client-core-5.5 +Architecture: any +Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5 +Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, + mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), + mysql-client-core-5.1, mysql-client-core-5.5, + mariadb-client-5.1, mariadb-client-core-5.1, + mariadb-client-5.2, mariadb-client-core-5.2, + mariadb-client-5.3, mariadb-client-core-5.3 +Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, + mysql-client-5.1, mysql-client-5.5, + mysql-client-core-5.1, mysql-client-core-5.5, + mariadb-client-5.1, mariadb-client-core-5.1, + mariadb-client-5.2, mariadb-client-core-5.2, + mariadb-client-5.3, mariadb-client-core-5.3 +Description: MariaDB database core client binaries + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the core client files, as used by Akonadi. + +Package: mariadb-client-5.5 +Architecture: any +Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mariadb-common, libmariadbclient18 (>= ${source:Version}), mariadb-client-core-5.5 (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends} +Provides: virtual-mysql-client, mysql-client, + mysql-client-4.1, mysql-client-5.1, mysql-client-5.5 +Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, + mariadb-client (<< ${source:Version}), + mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mysql-client-5.5 +Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, + mysql-client-5.5, + mariadb-client (<< ${source:Version}), + mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3 +Description: MariaDB database client binaries + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the client binaries and the additional tools + innotop and mysqlreport. + +Package: mariadb-server-core-5.5 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}) +Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5 +Conflicts: mariadb-server-5.1 (<< 5.1.60), + mariadb-server-5.2 (<< 5.2.10), + mariadb-server-5.3 (<< 5.3.3), + mysql-server-5.0, + mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5, + mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5 +Replaces: mariadb-server-5.1 (<< 5.1.60), + mariadb-server-5.2 (<< 5.2.10), + mariadb-server-5.3 (<< 5.3.3), + mysql-server-5.0, + mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5, + mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5 +Description: MariaDB database core server files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the core server files, as used by Akonadi. + +Package: mariadb-test-5.5 +Section: database +Architecture: any +Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version}) +Conflicts: mariadb-test (<< ${source:Version}), + mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, + mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) +Suggests: patch +Replaces: mariadb-test (<< ${source:Version}), + mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 +Description: MariaDB database regression test suite + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the regression test suite. + Package: mariadb-galera-server-5.5 Architecture: any Suggests: tinyca, mailx, mariadb-test diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 409612dccbb..9e8f491cfcb 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -10,6 +10,172 @@ Homepage: http://mariadb.org/ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files Vcs-Bzr: bzr://lp:maria +Package: libmariadbclient18 +Section: libs +Architecture: any +Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), + mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3 +Description: MariaDB database client library + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the client library. + +Package: libmysqlclient18 +Section: libs +Architecture: any +Depends: libmariadbclient18 (= ${source:Version}) +Replaces: libmysqlclient18 (<< ${source:Version}) +Description: Virtual package to satisfy external depends + This is an empty package that provides an updated "best" version of + libmysqlclient18 that does not conflict with the libmariadbclient18 + package. + . + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + +Package: libmariadbd-dev +Architecture: any +Section: libdevel +Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends} +Provides: libmysqld-dev +Conflicts: libmysqld-dev +Replaces: libmysqld-dev +Description: MariaDB embedded database development files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the embedded server library and header files. + +Package: libmariadbclient-dev +Architecture: any +Section: libdevel +Depends: libmariadbclient18 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends} +Replaces: libmariadbclient16-dev, libmysqlclient16-dev +Conflicts: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev +Provides: libmysqlclient-dev +Description: MariaDB database development files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes development libraries and header files. + +Package: mysql-common +Section: database +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes files needed by all versions of the client library + (e.g. /etc/mysql/my.cnf). + +Package: mariadb-common +Section: database +Architecture: all +Depends: mysql-common, ${shlibs:Depends}, ${misc:Depends} +Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes files needed by all versions of the client library + (e.g. /etc/mysql/conf.d/mariadb.cnf). + +Package: mariadb-client-core-5.5 +Architecture: any +Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5 +Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, + mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), + mysql-client-core-5.1, mysql-client-core-5.5, + mariadb-client-5.1, mariadb-client-core-5.1, + mariadb-client-5.2, mariadb-client-core-5.2, + mariadb-client-5.3, mariadb-client-core-5.3 +Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, + mysql-client-5.1, mysql-client-5.5, + mysql-client-core-5.1, mysql-client-core-5.5, + mariadb-client-5.1, mariadb-client-core-5.1, + mariadb-client-5.2, mariadb-client-core-5.2, + mariadb-client-5.3, mariadb-client-core-5.3 +Description: MariaDB database core client binaries + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the core client files, as used by Akonadi. + +Package: mariadb-client-5.5 +Architecture: any +Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mariadb-common, libmariadbclient18 (>= ${source:Version}), mariadb-client-core-5.5 (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends} +Provides: virtual-mysql-client, mysql-client, + mysql-client-4.1, mysql-client-5.1, mysql-client-5.5 +Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, + mariadb-client (<< ${source:Version}), + mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mysql-client-5.5 +Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, + mysql-client-5.5, + mariadb-client (<< ${source:Version}), + mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3 +Description: MariaDB database client binaries + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the client binaries and the additional tools + innotop and mysqlreport. + +Package: mariadb-server-core-5.5 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}) +Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5 +Conflicts: mysql-server-5.0, + mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5, + mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5 +Replaces: mysql-server-5.0, + mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5, + mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5 +Description: MariaDB database core server files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the core server files, as used by Akonadi. + +Package: mariadb-test-5.5 +Section: database +Architecture: any +Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version}) +Suggests: patch +Conflicts: mariadb-test (<< ${source:Version}), + mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, + mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33) +Replaces: mariadb-test (<< ${source:Version}), + mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 +Description: MariaDB database regression test suite + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the regression test suite. + Package: mariadb-galera-server-5.5 Architecture: any Suggests: tinyca, mailx, mariadb-test diff --git a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch b/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch index 4c84e14bf06..a52c198da8d 100755 --- a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch +++ b/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch @@ -10,7 +10,7 @@ @DPATCH@ --- old/scripts/mysql_system_tables_data.sql 2008-12-04 22:59:44.000000000 +0100 +++ new/scripts/mysql_system_tables_data.sql 2008-12-04 23:00:07.000000000 +0100 -@@ -26,8 +26,6 @@ +@@ -30,8 +30,6 @@ SELECT LOWER( REPLACE((SELECT REPLACE(@@ -- Fill "db" table with default grants for anyone to -- access database 'test' and 'test_%' if "db" table didn't exist CREATE TEMPORARY TABLE tmp_db LIKE db; @@ -19,12 +19,12 @@ INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0; DROP TABLE tmp_db; -@@ -40,8 +38,6 @@ - REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE LOWER( @current_hostname) != 'localhost'; +@@ -43,8 +41,6 @@ INSERT INTO tmp_user VALUES ('localhost' + REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE @current_hostname != 'localhost'; REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'',''); REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'',''); -INSERT INTO tmp_user (host,user) VALUES ('localhost',''); --INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost'; +-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost'; INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0; DROP TABLE tmp_user; - + diff --git a/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch b/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch index 81c1baf4375..5a9c3a59698 100755 --- a/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch +++ b/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch @@ -9,7 +9,7 @@ --- a/scripts/mysqld_safe.sh 2013-01-11 16:02:41 +0000 +++ b/scripts/mysqld_safe.sh 2013-01-11 16:03:14 +0000 -@@ -30,7 +30,6 @@ +@@ -32,7 +32,6 @@ err_log= syslog_tag_mysqld=mysqld syslog_tag_mysqld_safe=mysqld_safe @@ -17,7 +17,7 @@ # 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 -@@ -156,7 +155,7 @@ +@@ -163,7 +162,7 @@ eval_log_error () { # sed buffers output (only GNU sed supports a -u (unbuffered) option) # which means that messages may not get sent to syslog until the # mysqld process quits. @@ -26,7 +26,7 @@ ;; *) echo "Internal program error (non-fatal):" \ -@@ -758,6 +757,13 @@ +@@ -805,6 +804,13 @@ then fi # diff --git a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch b/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch index d4e67b321b0..5ab8ab3d3d7 100755 --- a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch +++ b/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch @@ -9,12 +9,12 @@ --- mysql-dfsg-5.1-5.1.23rc.orig/scripts/mysql_install_db.sh 2008-01-29 22:41:20.000000000 +0100 +++ mysql-dfsg-5.1-5.1.23rc/scripts/mysql_install_db.sh 2008-02-28 10:08:11.000000000 +0100 -@@ -306,7 +306,7 @@ +@@ -372,7 +372,7 @@ then fi # Create database directories -for dir in "$ldata" "$ldata/mysql" "$ldata/test" +for dir in "$ldata" "$ldata/mysql" do - if test ! -d $dir + if test ! -d "$dir" then diff --git a/debian/patches/44_scripts__mysql_config__libs.dpatch b/debian/patches/44_scripts__mysql_config__libs.dpatch index 1c15200aead..a8569617dba 100755 --- a/debian/patches/44_scripts__mysql_config__libs.dpatch +++ b/debian/patches/44_scripts__mysql_config__libs.dpatch @@ -8,7 +8,7 @@ diff -Nur mysql-dfsg-5.1-5.1.31.orig/scripts/mysql_config.sh mysql-dfsg-5.1-5.1.31/scripts/mysql_config.sh --- mysql-dfsg-5.1-5.1.31.orig/scripts/mysql_config.sh 2009-01-19 17:30:55.000000000 +0100 +++ mysql-dfsg-5.1-5.1.31/scripts/mysql_config.sh 2009-02-08 17:17:48.000000000 +0100 -@@ -110,10 +110,10 @@ +@@ -106,10 +106,10 @@ fi # Create options # We intentionally add a space to the beginning and end of lib strings, simplifies replace later diff --git a/debian/patches/50_mysql-test__db_test.dpatch b/debian/patches/50_mysql-test__db_test.dpatch index fe356ae46ef..670afbf14ac 100755 --- a/debian/patches/50_mysql-test__db_test.dpatch +++ b/debian/patches/50_mysql-test__db_test.dpatch @@ -10,9 +10,9 @@ --- 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 -@@ -2717,6 +2717,11 @@ +@@ -3578,6 +3578,11 @@ sub mysql_install_db { mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql", - $bootstrap_sql_file); + $bootstrap_sql_file); + mtr_tofile($bootstrap_sql_file, "-- Debian removed the default privileges on the 'test' database\n"); + mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');\n"); |