diff options
Diffstat (limited to 'support-files')
52 files changed, 180 insertions, 1696 deletions
diff --git a/support-files/debian/README.debian b/support-files/debian/README.debian deleted file mode 100644 index 9a990585854..00000000000 --- a/support-files/debian/README.debian +++ /dev/null @@ -1,47 +0,0 @@ -mysql for DEBIAN ----------------------- - -Comments regarding the Package - -* about patch files - if you want to make new patch, - write patch file and put it into debian/patches/. - debian/rules do patch debian/patches/* automatically. - -* about server packages - I use Debian alternative system, to switch next 3 type MySQL server. - - mysql-server : - this is static linked MySQL server(/usr/sbin/mysqld-static) and share/mysql/ files. - mysql-server-shared: - this is dynamic linked MySQL server only. (/usr/sbin/mysqld-shared) - mysql-server-debug: - --with-debug flag. mysqld only. (/usr/sbin/mysqld-debug) - -* about MySQL-Max packages: - - mysql-max : - this is static linked MySQL-Max server only. (/usr/sbin/mysqld-max-static). - mysql-max-shared: - this is dynamic linked MySQL server only. (/usr/sbin/mysqld-max-shared) - mysql-max-debug: - --with-debug flag. mysqld only. (/usr/sbin/mysqld-max-debug) - -* about charset - I build MySQL server --with-extra-charsets=all - -* about location - server programs ...... /usr/sbin/ - share files .......... /usr/share/mysql/ - client programs ...... /usr/bin/ - MySQL data directory . /var/mysql/data/ - benchmark directory .. /var/mysql/sql-bench/ - socket file ......... /tmp/mysql.sock - include files ........ /usr/include/mysql/ - libraries ........... /usr/lib/ , /usr/lib/mysql/ - put libmysqlclient* into /usr/lib/ , - others, put /usr/lib/mysql/ . - - -takeshi@SoftAgency.co.jp - diff --git a/support-files/debian/changelog b/support-files/debian/changelog deleted file mode 100644 index e52589d7025..00000000000 --- a/support-files/debian/changelog +++ /dev/null @@ -1,543 +0,0 @@ -mysql (3.23.39-1) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Sat, 12 May 2001 05:07:35 +0900 - -mysql (3.23.38-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Sat, 12 May 2001 05:07:35 +0900 - -mysql (3.23.37-1potato.2) unstable; urgency=low - - * new - * add mysql-max multi packages. - - -- takeshi <takeshi@softagency.co.jp> Thr, 26 Apr 2001 05:07:35 +0900 - -mysql (3.23.37-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Thr, 26 Apr 2001 05:07:35 +0900 - -mysql (3.23.36-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Thr, 29 Mar 2001 05:07:35 +0900 - -mysql (3.23.35-1potato.1) unstable; urgency=low - - * sql fix patch - - -- takeshi <takeshi@softagency.co.jp> Thr, 22 Mar 2001 05:07:35 +0900 - -mysql (3.23.35-1potato) unstable; urgency=low - - * new - * --with-innobase - - -- takeshi <takeshi@softagency.co.jp> Sat, 17 Mar 2001 05:07:35 +0900 - -mysql (3.23.34a-1potato) unstable; urgency=low - - * new - * --with-innobase - - -- takeshi <takeshi@softagency.co.jp> Wed, 14 Mar 2001 05:07:35 +0900 - -mysql (3.23.33-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Tue, 13 Feb 2001 05:07:35 +0900 - -mysql (3.23.32-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Tue, 23 Jan 2001 05:07:35 +0900 - -mysql (3.23.31-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Fri, 19 Jan 2001 05:07:35 +0900 - -mysql (3.23.30-gamma-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Sat, 6 Jan 2001 05:07:35 +0900 - -mysql (3.23.29a-gamma-1potato.3) unstable; urgency=low - - * server:/usr/sbin/{mysql_config, mysqltest} -> client:/usr/bin/ - * server:/usr/bin/my_print_defaults -> client:/usr/bin/ - * /usr/mysql-test -> mysql-bench /var/mysql/mysql-test - - -- takeshi <takeshi@softagency.co.jp> Fri, 29 Dec 2000 05:07:35 +0900 - -mysql (3.23.29a-gamma-1potato.2) unstable; urgency=low - - * /usr/mysql-test -> mysql-bench /var/mysql/mysql-test - - -- takeshi <takeshi@softagency.co.jp> Sun, 17 Dec 2000 05:07:35 +0900 - -mysql (3.23.29a-gamma-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Sun, 17 Dec 2000 05:07:35 +0900 - -mysql (3.23.28-gamma-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Fri, 24 Nov 2000 05:07:35 +0900 - -mysql (3.23.27-beta-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Fri, 28 Oct 2000 05:07:35 +0900 - -mysql (3.23.26-beta-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Sun, 22 Oct 2000 05:07:35 +0900 - -mysql (3.23.25-beta-1potato) unstable; urgency=low - - * new , libmysqlclient10 - * change debian/control file. remove Provides keyword - - -- takeshi <takeshi@softagency.co.jp> Fri, 29 Sep 2000 05:07:35 +0900 - -mysql (3.23.24-1potato.2) unstable; urgency=low - - * fix debian/control file - * move patch into debian/patches/ - if you want to make new patch, - write patch file and put it into debian/patches/. - debian/rules do patch debian/patches/* automatically. - * change debian/rules , debian/move - * back mysql_resolveip -> resolveip , mysql_perror -> perror - - -- takeshi <takeshi@softagency.co.jp> Thr, 14 Sep 2000 05:07:35 +0900 - -mysql (3.23.24-1potato) unstable; urgency=low - - * move patch into debian/patches/ - if you want to make new patch, - write patch file and put it into debian/patches/. - debian/rules do patch debian/patches/* automatically. - * change debian/rules , debian/move - * back mysql_resolveip -> resolveip , mysql_perror -> perror - - -- takeshi <takeshi@softagency.co.jp> Sat, 9 Sep 2000 05:07:35 +0900 - -mysql (3.23.23-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Sat, 2 Sep 2000 05:07:35 +0900 - -mysql (3.23.22-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Tue, 1 Aug 2000 05:07:35 +0900 - -mysql (3.23.21-1potato.2) unstable; urgency=low - - * MYI patch - * /usr/lib/mysql/libmysqlclient.a -> /usr/lib/ - * libmysqlclient patch - * fix mysql-dev conflicts libmysqlclient6 - - -- takeshi <takeshi@softagency.co.jp> Sun, 30 Jul 2000 05:07:35 +0900 - -mysql (3.23.21-1potato.1) unstable; urgency=low - - * MYI patch - * /usr/lib/mysql/libmysqlclient.a -> /usr/lib/ - - -- takeshi <takeshi@softagency.co.jp> Tue, 25 Jul 2000 05:07:35 +0900 - -mysql (3.23.21-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Thr, 6 Jul 2000 05:07:35 +0900 - -mysql (3.23.20-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Thr, 29 Jun 2000 05:07:35 +0900 - -mysql (3.23.19-1potato) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Thr, 29 Jun 2000 05:07:35 +0900 - -mysql (3.23.18-1) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Tue, 13 May 2000 05:07:35 +0900 - -mysql (3.23.17-1) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Wed, 31 May 2000 05:07:35 +0900 - -mysql (3.23.16-1) unstable; urgency=low - - * new - * branch static mysqld & shared mysqld - * no need ujis,sjis branch. 3.23 support dynamic charset - * add conf file /etc/my.cnf - - -- takeshi <takeshi@softagency.co.jp> Wed, 31 May 2000 05:07:35 +0900 - -mysql (3.22.32-2) unstable; urgency=low - - * fix mysqldump - * fix sjis - - -- takeshi <takeshi@softagency.co.jp> Thr, 6 Apr 2000 05:07:35 +0900 - -mysql (3.22.32-1) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Tue, 15 Feb 2000 05:07:35 +0900 - -mysql (3.22.30-2) unstable; urgency=low - - * fix perl path - * with system readline - - -- takeshi <takeshi@softagency.co.jp> Tue, 8 Feb 2000 05:07:35 +0900 - -mysql (3.22.30-1) unstable; urgency=low - - * new - * OOP! debian remove libreadlineg2-dev! - --without-readline => --with-readline - - -- takeshi <takeshi@softagency.co.jp> Fri, 14 Jan 2000 05:07:35 +0900 - -mysql (3.22.29-1) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Mon, 3 Jan 2000 05:07:35 +0900 - -mysql (3.22.29-0bo) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Mon, 3 Jan 2000 05:07:35 +0900 - -mysql (3.22.27-0bo.2) unstable; urgency=low - - * with linuxthread-0.71 - - -- takeshi <takeshi@softagency.co.jp> Thr, 9 Dec 1999 05:07:35 +0900 - -mysql (3.22.27-0bo.1) unstable; urgency=low - - * fix: mysqlaccess incorrect path - - -- takeshi <takeshi@softagency.co.jp> Sat, 13 Nov 1999 05:07:35 +0900 - -mysql (3.22.27-0bo) unstable; urgency=low - - * sql/sql_parse.cc patch - - -- takeshi <takeshi@softagency.co.jp> Wed, 13 Oct 1999 05:07:35 +0900 - -mysql (3.22.26a-0bo.1) unstable; urgency=low - - * BLOB SELECT DISTINCT patch - * all static linked - * fix: @sbindir@ was not changed - * mysql_find_rows -> /usr/bin/ - - -- takeshi <takeshi@softagency.co.jp> Mon, 20 Sep 1999 05:07:35 +0900 - -mysql (3.22.26a-0bo) unstable; urgency=low - - * new upstream - * fix incorrect path: init.d/mysql (= mysql.server.sh), msql2mysql, mysql_install_db - * change daemon user -> mysql - - -- takeshi <takeshi@softagency.co.jp> Mon, 13 Sep 1999 05:07:35 +0900 - -mysql (3.22.25-0bo) unstable; urgency=low - - * new - * change : libmysql6 -> libmysqlclient6 - - -- takeshi <takeshi@softagency.co.jp> Tue, 3 Aug 1999 05:07:35 +0900 - -mysql (3.22.24-0bo) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Mon, 25 Jul 1999 05:07:35 +0900 - -mysql (3.22.23b-0bo.1) unstable; urgency=low - - * new - * gcc patch + sql_load patch - - -- takeshi <takeshi@softagency.co.jp> Thr, 24 Jun 1999 05:07:35 +0900 - -mysql (3.22.23b-0bo) unstable; urgency=low - - * new - * gcc patch - - -- takeshi <takeshi@softagency.co.jp> Tue, 15 Jun 1999 05:07:35 +0900 - -mysql (3.22.22-0bo) unstable; urgency=low - - * new - - -- takeshi <takeshi@softagency.co.jp> Mon, 3 May 1999 05:07:35 +0900 - -mysql (3.22.21-0bo.1) unstable; urgency=low - - * re-compile - - -- takeshi <takeshi@softagency.co.jp> Fri, 30 Apr 1999 05:07:35 +0900 - -mysql (3.22.21-0bo) unstable; urgency=low - - * New up stream - - -- takeshi <takeshi@softagency.co.jp> Tue, 6 Apr 1999 05:07:35 +0900 - -mysql (3.22.20a-0bo) unstable; urgency=low - - * New up stream - - -- takeshi <takeshi@softagency.co.jp> Fri, 19 Mar 1999 05:07:35 +0900 - -mysql (3.22.19a-0bo) unstable; urgency=low - - * New up stream - - -- takeshi <takeshi@softagency.co.jp> Wed, 3 Mar 1999 05:07:35 +0900 - -mysql (3.22.18-0bo) unstable; urgency=low - - * New up stream - - -- takeshi <takeshi@softagency.co.jp> Sun, 28 Feb 1999 05:07:35 +0900 - -mysql (3.22.16a-gamma-0bo.1) unstable; urgency=low - - * fix libmysqlclient5 -> libmysqlclient6 - - -- takeshi <takeshi@softagency.co.jp> Thr, 11 Feb 1999 05:07:35 +0900 - -mysql (3.22.16a-gamma-0bo) unstable; urgency=low - - * new upstream - - -- takeshi <takeshi@softagency.co.jp> Sun, 7 Feb 1999 05:07:35 +0900 - -mysql (3.22.15-gamma-0bo) unstable; urgency=low - - * new upstream - - -- takeshi <takeshi@softagency.co.jp> Fri, 29 Jan 1999 05:07:35 +0900 - -mysql (3.22.14b-gamma-0bo) unstable; urgency=low - - * new upstream - * apply mb problem patch - - -- takeshi <takeshi@softagency.co.jp> Tue, 26 Jan 1999 05:07:35 +0900 - -mysql (3.22.14-gamma-0bo.1) unstable; urgency=low - - * egcs -all-static - - -- takeshi <takeshi@softagency.co.jp> Sun, 3 Jan 1999 05:07:35 +0900 - -mysql (3.22.14-gamma-0bo) unstable; urgency=low - - * New upstream - - -- takeshi <takeshi@softagency.co.jp> Sun, 3 Jan 1999 05:07:35 +0900 - -mysql (3.22.13-beta-0bo) unstable; urgency=low - - * New upstream - - -- takeshi <takeshi@softagency.co.jp> Fri, 11 Nov 1998 00:29:14 +0900 - -mysql (3.22.12-beta-0bo) unstable; urgency=low - - * New upstream - - -- takeshi <takeshi@softagency.co.jp> Fri, 11 Nov 1998 00:29:14 +0900 - -mysql (3.22.11-beta-0bo) unstable; urgency=low - - * New upstream - * !!! CHANGE PACKAGE NAME !!! - libmysql5 <- only libmysqlclinet.so.5 - mysql-client <- client commands - mysql-server <- server - mysql-dev <- .h & .a - mysql-doc <- Docs - mysql-bench <- benchmark suite. - - -- takeshi <takeshi@softagency.co.jp> Wed, 25 Nov 1998 15:03:45 +0900 - -mysql (3.22.10-beta-0bo.2) unstable; urgency=low - - * fix debian/rules , debian/*.dirs - * gcc-2.7.2.3, g++-2.7.2.1 compiled - * remove /usr/bin/mysql-sub/ - * rename /usr/bin/mysql-sub/replace -> /usr/bin/mysql_replace - * mv mysql-base:/usr/bin/mysql-sub/{perror,resolveip} -> mysql-server:/usr/bin/ - perror -> mysql_perror - resolveip-> mysql_resolveip - * mv add_*, make_binary_distribution -> /usr/share/mysql/ - * add japanese errmsg (/usr/share/mysql/japanese) - - -- takeshi <takeshi@softagency.co.jp> Fri, 13 Nov 1998 15:03:45 +0900 - -mysql (3.22.10-beta-0bo.1) unstable; urgency=low - - * fix debian/rules - * egcs compiled - * link libstdc++2.8.a (mysqld), so, you don't need libstdc++2.8 for running mysqld. - (not client programs.) - - -- takeshi <takeshi@softagency.co.jp> Wed, 11 Nov 1998 15:03:45 +0900 - -mysql (3.22.10-beta-0bo) unstable; urgency=low - - * New upstream - * egcs compiled - * fix: mysql-base-{char}/usr/bin/comp_err -> mysql-server-{char}/usr/sbin/comp_err - - -- takeshi <takeshi@softagency.co.jp> Thr, 5 Nov 1998 15:03:45 +0900 - -mysql (3.22.9-beta-0bo.1) unstable; urgency=low - - * new patch to sql_string.cc ('%' bug) - - -- takeshi <takeshi@softagency.co.jp> Tue, 27 Oct 1998 15:03:45 +0900 - -mysql (3.22.9-beta-0bo) unstable; urgency=low - - * fix cflags - * fix diff files - * fix & change categorize of client or server - mysql-server: - /usr/sbin/mysql_install_db - safe_mysqld mysqld - isamchk isamlog - - mysql-base: - /usr/bin/ - comp_err msql2mysql mysql mysql_zap - mysqlaccess mysqladmin mysqlbug - mysqldump mysqlimport mysqlshow - - /usr/bin/mysql-sub/ - add_file_priv add_func_table - add_long_password make_binary_distribution - perror replace resolveip - - * patch to sql_string.cc ('%' bug) - - -- takeshi <takeshi@softagency.co.jp> Wed, 7 Oct 1998 15:03:45 +0900 - -mysql (3.22.8-beta-0bo) unstable; urgency=low - - * New up stream - - -- takeshi <takeshi@softagency.co.jp> Wed, 7 Oct 1998 15:03:45 +0900 - -mysql (3.22.7b-0bo.1) unstable; urgency=low - - * left join patch - - -- takeshi <takeshi@softagency.co.jp> Thr, 24 Sep 1998 15:03:45 +0900 - -mysql (3.22.7b-0bo) unstable; urgency=low - - * New upstream version (bo) - * mb patch - * *.a -> /usr/lib/mysql/ - * add_file_priv add_func_table make_binary_distribution - add_long_password perror replace resolveip - -> /usr/bin/mysql-sub/ - * mysqld, safe_mysqld, mysql_install_db -> mysql-server /usr/sbin/ - * add '-lm -lz -ldl' when building libmysqlclient.so.4.0.0 - - -- takeshi <takeshi@softagency.co.jp> Sat, 15 Aug 1998 15:03:45 +0900 - -mysql (3.22.4a-0bo) unstable; urgency=low - - * New upstream version (bo) - * use system libreadline - - -- takeshi <takeshi@softagency.co.jp> Sat, 15 Aug 1998 15:03:45 +0900 - -mysql (3.21.33-0bo) unstable; urgency=low - - * New upstream version - - -- takeshi <takeshi@softagency.co.jp> Wed, 22 Jul 1998 12:51:45 +0900 - -mysql (3.21.30-1) unstable; urgency=low - - * New upstream version - * fix conffile setting - - -- takeshi <takeshi@softagency.co.jp> Tue, 12 May 1998 20:24:45 +0900 - -mysql (3.21.29.gamma-2) unstable; urgency=low - - * charset=ujis,sjis packages - * branch mysql-base-* (lib*.so) - * /usr/local/mysql/lib/mysql/lib* -> /usr/lib/ - * /usr/local/mysql/include -> /usr/include - * /usr/local/mysql/info -> /usr/info - * /usr/local/mysql/man -> /usr/man - * /usr/local/mysql/share -> /usr/share - * /usr/local/mysql/bin -> /usr/bin - * /usr/local/mysql/libexec -> /usr/sbin - * /usr/local/mysql/var -> /var/mysql/data - * /usr/local/mysql/sql-bench -> /var/mysql/sql-bench - - -- takeshi <takeshi@softagency.co.jp> Fri, 8 May 1998 00:04:45 +0900 - -mysql (3.21.29.gamma-1) unstable; urgency=low - - * Initial Release. - - -- takeshi <takeshi@softagency.co.jp> Sat, 2 May 1998 03:42:24 +0900 - -Local variables: -mode: debian-changelog -add-log-mailing-address: "takeshi@softagency.co.jp" -End: diff --git a/support-files/debian/control b/support-files/debian/control deleted file mode 100644 index 3ccc1d097c8..00000000000 --- a/support-files/debian/control +++ /dev/null @@ -1,112 +0,0 @@ -Source: mysql -Section: devel -Priority: extra -Maintainer: takeshi <takeshi@softagency.co.jp> -Standards-Version: 2.1.2.2 - -Package: mysql -Architecture: all -Description: mysql - Missing - -Package: mysql-doc -Architecture: all -Section: doc -Priority: extra -Replaces: mysql-gpl-doc -Description: mysql Documentation (html) - MySQL Doc. - -Package: libmysqlclient10 -Architecture: any -Section: libs -Priority: extra -Description: libmysqlclient.so.10 - libmysqlclient.so.10 - -Package: mysql-client -Architecture: any -Depends: ${shlibs:Depends} -Section: misc -Priority: extra -Conflicts: mysql-client-ujis, mysql-client-sjis -Replaces: mysql-gpl-client, mysql-base (<< 3.22.11), mysql-base-ujis (<< 3.22.11), mysql-base-sjis (<< 3.22.11), mysql-client-ujis, mysql-client-sjis -Description: mysql clients. - MySQL clients programs. - -Package: mysql-server -Architecture: any -Section: misc -Priority: extra -Depends: ${shlibs:Depends} -Conflicts: mysql-server-sjis, mysql-server-ujis, mysql-server (<< 3.23.0) -Replaces: mysql-server-sjis, mysql-base (<< 3.22.11), mysql-base-ujis (<< 3.22.11), mysql-base-sjis (<< 3.22.11), mysql-server-sjis, mysql-server-ujis, mysql-server (<< 3.23.0), mysql-common -Description: MySQL server (static linked) - MySQL server. static linked. - -Package: mysql-server-shared -Architecture: any -Section: misc -Priority: extra -Depends: mysql-server, ${shlibs:Depends} -Conflicts: mysql-server-sjis, mysql-server-ujis, mysql-server (<< 3.23.0) -Replaces: mysql-server-sjis, mysql-base (<< 3.22.11), mysql-base-ujis (<< 3.22.11), mysql-base-sjis (<< 3.22.11), mysql-server-sjis, mysql-server-ujis, mysql-server (<< 3.23.0) -Description: MySQL server (dynamic linked) - MySQL server. dynamic linked. - -Package: mysql-server-debug -Architecture: any -Section: misc -Priority: extra -Depends: mysql-server, ${shlibs:Depends} -Conflicts: mysql-server-sjis, mysql-server-ujis, mysql-server (<< 3.23.0) -Replaces: mysql-server-sjis, mysql-base (<< 3.22.11), mysql-base-ujis (<< 3.22.11), mysql-base-sjis (<< 3.22.11), mysql-server-sjis, mysql-server-ujis, mysql-server (<< 3.23.0) -Description: MySQL server debug - MySQL server. debug - -Package: mysql-max -Architecture: any -Section: misc -Priority: extra -Depends: mysql-server -Conflicts: mysql-server-sjis, mysql-server-ujis, mysql-server (<< 3.23.0) -Replaces: mysql-server-sjis, mysql-base (<< 3.22.11), mysql-base-ujis (<< 3.22.11), mysql-base-sjis (<< 3.22.11), mysql-server-sjis, mysql-server-ujis, mysql-server (<< 3.23.0) -Description: MySQL-MAX server (static linked) - MySQL-Max server. (static linked) - -Package: mysql-max-shared -Architecture: any -Section: misc -Priority: extra -Depends: mysql-server, ${shlibs:Depends} -Conflicts: mysql-server-sjis, mysql-server-ujis, mysql-server (<< 3.23.0) -Replaces: mysql-server-sjis, mysql-base (<< 3.22.11), mysql-base-ujis (<< 3.22.11), mysql-base-sjis (<< 3.22.11), mysql-server-sjis, mysql-server-ujis, mysql-server (<< 3.23.0) -Description: MySQL-MAX server (shared linked) - MySQL-Max server. (shared linked) - -Package: mysql-max-debug -Architecture: any -Section: misc -Priority: extra -Depends: mysql-server, ${shlibs:Depends} -Conflicts: mysql-server-sjis, mysql-server-ujis, mysql-server (<< 3.23.0) -Replaces: mysql-server-sjis, mysql-base (<< 3.22.11), mysql-base-ujis (<< 3.22.11), mysql-base-sjis (<< 3.22.11), mysql-server-sjis, mysql-server-ujis, mysql-server (<< 3.23.0) -Description: MySQL-MAX server (with debug shared linked) - MySQL-Max server. (with debug and shared linked) - -Package: mysql-dev -Architecture: any -Section: devel -Priority: extra -Depends: ${shlibs:Depends} -Conflicts: mysql-dev-sjis, mysql-dev-ujis -Replaces: mysql-devel, libmysqlclient10-dev, libmysqlclient9-dev, libmysqlclient6-dev, mysql-gpl-dev, mysql-dev-sjis, mysql-dev-ujis, libmysqlclient6-ujis, libmysqlclient6-sjis -Description: MySQL develop suite - MySQL develop. - -Package: mysql-bench -Architecture: all -Section: misc -Priority: extra -Description: mysql benchmark suite. - MySQL sql-bench files. diff --git a/support-files/debian/copyright b/support-files/debian/copyright deleted file mode 100644 index 3e97dbf8358..00000000000 --- a/support-files/debian/copyright +++ /dev/null @@ -1,8 +0,0 @@ -This package was debianized by takeshi@softagency.co.jp on -Sat, 2 May 1998 03:42:24 +0900. - -It was downloaded from -http://www.mysql.com/ - -Copyright: -GPL diff --git a/support-files/debian/gomi b/support-files/debian/gomi deleted file mode 100644 index 70251058af0..00000000000 --- a/support-files/debian/gomi +++ /dev/null @@ -1,24 +0,0 @@ -Docs/Makefile -dbug/Makefile -extra/Makefile -heap/Makefile -mysys/Makefile -readline/Makefile -regex/Makefile -sql/Makefile -sql/share/Makefile -strings/Makefile -support-files/binary-configure -support-files/my-example.cnf -support-files/mysql-log-rotate -scripts/add_func_table -scripts/mysql_setpermisson -scripts/mysqlbug -scripts/mysqlhotcopy -client/my_static.h -client/mysys_priv.h -include/my_config.h -sql/lex_hash.h -sql-bench/Makefile -scripts/mysql_config -libmysql_r/Makefile diff --git a/support-files/debian/libmysqlclient10.dirs b/support-files/debian/libmysqlclient10.dirs deleted file mode 100644 index 68457717bd8..00000000000 --- a/support-files/debian/libmysqlclient10.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/support-files/debian/libmysqlclient10.postinst b/support-files/debian/libmysqlclient10.postinst deleted file mode 100644 index 2d1871b1df6..00000000000 --- a/support-files/debian/libmysqlclient10.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -ldconfig diff --git a/support-files/debian/libmysqlclient9.dirs b/support-files/debian/libmysqlclient9.dirs deleted file mode 100644 index 68457717bd8..00000000000 --- a/support-files/debian/libmysqlclient9.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/support-files/debian/libmysqlclient9.postinst b/support-files/debian/libmysqlclient9.postinst deleted file mode 100644 index 2d1871b1df6..00000000000 --- a/support-files/debian/libmysqlclient9.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -ldconfig diff --git a/support-files/debian/move b/support-files/debian/move deleted file mode 100644 index 36f250fcfb3..00000000000 --- a/support-files/debian/move +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -STAMPFILE="debian/stamp-move" - -if [ -e $STAMPFILE ]; then - exit -fi - -#---------- -CLIENT1="msql2mysql mysql mysql_convert_table_format mysql_find_rows mysql_fix_privilege_tables mysql_setpermission mysql_zap mysqlaccess mysqladmin mysqlbug mysqldump mysqlhotcopy mysqlimport mysqlshow mysql_config mysqltest my_print_defaults" - -# CLIENT2="add_file_priv add_func_table add_long_password make_binary_distribution" - - - -P=`pwd` - -#---------- -for CHAR in build -do - #----- - cp -Rpd debian/${CHAR}/usr debian/mysql-server/ - cp -Rpd debian/${CHAR}-shared/usr/lib/mysql/libmysqlclient.so.* debian/libmysqlclient10/usr/lib/ - - #----- mysql-server-shared --- - cp -Rpd debian/${CHAR}-shared/usr/sbin/mysqld debian/mysql-server-shared/usr/sbin/mysqld-shared - - #----- mysql-server-debug --- - cp -Rpd debian/${CHAR}-debug/usr/sbin/mysqld debian/mysql-server-debug/usr/sbin/mysqld-debug - - #----- mysql-server --- - mv debian/mysql-server/usr/sbin/mysqld debian/mysql-server/usr/sbin/mysqld-static - - #----- mysql-max-shared --- - cp -Rpd debian/${CHAR}-max-shared/usr/sbin/mysqld debian/mysql-max-shared/usr/sbin/mysqld-max-shared - - #----- mysql-max-debug --- - cp -Rpd debian/${CHAR}-max-debug/usr/sbin/mysqld debian/mysql-max-debug/usr/sbin/mysqld-max-debug - - #----- mysql-max --- - mv debian/${CHAR}-max/usr/sbin/mysqld debian/mysql-max/usr/sbin/mysqld-max-static - - #----- mysql-client ---- - cd ${P}/debian/mysql-server/usr/bin/ && mv $CLIENT1 ../../../mysql-client/usr/bin/ - cd ${P} - - mv -f debian/mysql-server/usr/{man,info} debian/mysql-client/usr/share/ -# mv debian/mysql-server/usr/share/mysql/my-*.cnf debian/mysql-client/usr/share/mysql/ - mv -f debian/mysql-server/usr/bin/replace debian/mysql-client/usr/bin/mysql_replace - - #----- mysql-server --- - mv debian/mysql-server/usr/bin/* debian/mysql-server/usr/sbin/ - mv debian/mysql-server/usr/sbin/comp_err debian/mysql-server/usr/bin/ - mv debian/mysql-server/usr/sbin/perror debian/mysql-server/usr/bin/ - mv debian/mysql-server/usr/sbin/resolveip debian/mysql-server/usr/bin/ - - #----- mysql-dev ---- - cp -Rpd debian/${CHAR}-shared/usr/lib/mysql/libmysqlclient.so debian/mysql-dev/usr/lib/ - mv debian/mysql-server/usr/include debian/mysql-dev/usr/ - mv debian/mysql-server/usr/lib/mysql debian/mysql-dev/usr/lib/ - - mv debian/mysql-dev/usr/lib/mysql/libmysqlclient.a debian/mysql-dev/usr/lib/ - (cd debian/mysql-dev/usr/lib/mysql ; ln -sf "../libmysqlclient.a" ) - - #----- - cp debian/README.debian debian/copyright debian/changelog \ - debian/mysql-client/usr/share/doc/mysql/ - -done - - -#################### -### doc -cp -r COPYING* MIRRORS README* Docs/* debian/mysql-doc/usr/share/doc/mysql/ - -#### sql-bench -mv debian/mysql-server/usr/sql-bench \ - debian/mysql-server/usr/mysql-test \ - debian/mysql-bench/var/mysql/ - -touch $STAMPFILE diff --git a/support-files/debian/my.cnf b/support-files/debian/my.cnf deleted file mode 100644 index 0c9856ec5a7..00000000000 --- a/support-files/debian/my.cnf +++ /dev/null @@ -1,42 +0,0 @@ -# Example mysql config file. -# You can copy this to one of: -# /etc/my.cnf to set global options, -# mysql-data-dir/my.cnf to set server-specific options (in this -# installation this directory is @localstatedir@) or -# ~/.my.cnf to set user-specific options. -# -# One can use all long options that the program supports. -# Run the program with --help to get a list of available options - -# This will be passed to all mysql clients -[client] -#password = my_password -#port = 3306 -#socket = /tmp/mysql.sock - -# Here is entries for some specific programs -# The following values assume you have at least 32M ram - -# The MySQL server -[mysqld] -default-character-set = ujis -#port = 3306 -#socket = /tmp/mysql.sock -#skip-locking -#set-variable = key_buffer=16M -#set-variable = max_allowed_packet=1M -#set-variable = thread_stack=128K -## Start logging -#log - -[mysqldump] -default-character-set = ujis -#quick -#set-variable = max_allowed_packet=16M - -[mysql] -default-character-set = ujis -#no-auto-rehash - -[isamchk] -#set-variable = key_buffer=16M diff --git a/support-files/debian/mysql-bench.dirs b/support-files/debian/mysql-bench.dirs deleted file mode 100644 index 0ba3faa84f9..00000000000 --- a/support-files/debian/mysql-bench.dirs +++ /dev/null @@ -1 +0,0 @@ -var/mysql diff --git a/support-files/debian/mysql-client.dirs b/support-files/debian/mysql-client.dirs deleted file mode 100644 index 0ade9d76f65..00000000000 --- a/support-files/debian/mysql-client.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/mysql -usr/share/doc/mysql diff --git a/support-files/debian/mysql-dev.dirs b/support-files/debian/mysql-dev.dirs deleted file mode 100644 index 68457717bd8..00000000000 --- a/support-files/debian/mysql-dev.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/support-files/debian/mysql-doc.dirs b/support-files/debian/mysql-doc.dirs deleted file mode 100644 index b8aa0f769f9..00000000000 --- a/support-files/debian/mysql-doc.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/mysql diff --git a/support-files/debian/mysql-max-debug.dirs b/support-files/debian/mysql-max-debug.dirs deleted file mode 100644 index 236670a2d0f..00000000000 --- a/support-files/debian/mysql-max-debug.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/sbin diff --git a/support-files/debian/mysql-max-debug.postinst b/support-files/debian/mysql-max-debug.postinst deleted file mode 100644 index e9d8b628c2e..00000000000 --- a/support-files/debian/mysql-max-debug.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -update-alternatives --install /usr/sbin/mysqld mysqld /usr/sbin/mysqld-max-debug 40 diff --git a/support-files/debian/mysql-max-debug.postrm b/support-files/debian/mysql-max-debug.postrm deleted file mode 100644 index 25c7aadf494..00000000000 --- a/support-files/debian/mysql-max-debug.postrm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -update-alternatives --auto mysqld diff --git a/support-files/debian/mysql-max-shared.dirs b/support-files/debian/mysql-max-shared.dirs deleted file mode 100644 index 236670a2d0f..00000000000 --- a/support-files/debian/mysql-max-shared.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/sbin diff --git a/support-files/debian/mysql-max-shared.postinst b/support-files/debian/mysql-max-shared.postinst deleted file mode 100644 index d47d85c73eb..00000000000 --- a/support-files/debian/mysql-max-shared.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -update-alternatives --install /usr/sbin/mysqld mysqld /usr/sbin/mysqld-max-shared 35 diff --git a/support-files/debian/mysql-max-shared.postrm b/support-files/debian/mysql-max-shared.postrm deleted file mode 100644 index 25c7aadf494..00000000000 --- a/support-files/debian/mysql-max-shared.postrm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -update-alternatives --auto mysqld diff --git a/support-files/debian/mysql-max.dirs b/support-files/debian/mysql-max.dirs deleted file mode 100644 index 236670a2d0f..00000000000 --- a/support-files/debian/mysql-max.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/sbin diff --git a/support-files/debian/mysql-max.postinst b/support-files/debian/mysql-max.postinst deleted file mode 100644 index a65ccd5b6c7..00000000000 --- a/support-files/debian/mysql-max.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -update-alternatives --install /usr/sbin/mysqld mysqld /usr/sbin/mysqld-max-static 30 diff --git a/support-files/debian/mysql-max.postrm b/support-files/debian/mysql-max.postrm deleted file mode 100644 index 25c7aadf494..00000000000 --- a/support-files/debian/mysql-max.postrm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -update-alternatives --auto mysqld diff --git a/support-files/debian/mysql-server-debug.dirs b/support-files/debian/mysql-server-debug.dirs deleted file mode 100644 index 236670a2d0f..00000000000 --- a/support-files/debian/mysql-server-debug.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/sbin diff --git a/support-files/debian/mysql-server-debug.postinst b/support-files/debian/mysql-server-debug.postinst deleted file mode 100644 index d48c21be9a7..00000000000 --- a/support-files/debian/mysql-server-debug.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -update-alternatives --install /usr/sbin/mysqld mysqld /usr/sbin/mysqld-debug 20 diff --git a/support-files/debian/mysql-server-debug.postrm b/support-files/debian/mysql-server-debug.postrm deleted file mode 100644 index 25c7aadf494..00000000000 --- a/support-files/debian/mysql-server-debug.postrm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -update-alternatives --auto mysqld diff --git a/support-files/debian/mysql-server-shared.dirs b/support-files/debian/mysql-server-shared.dirs deleted file mode 100644 index 236670a2d0f..00000000000 --- a/support-files/debian/mysql-server-shared.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/sbin diff --git a/support-files/debian/mysql-server-shared.postinst b/support-files/debian/mysql-server-shared.postinst deleted file mode 100644 index 00c7248327a..00000000000 --- a/support-files/debian/mysql-server-shared.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -update-alternatives --install /usr/sbin/mysqld mysqld /usr/sbin/mysqld-shared 15 diff --git a/support-files/debian/mysql-server-shared.postrm b/support-files/debian/mysql-server-shared.postrm deleted file mode 100644 index 25c7aadf494..00000000000 --- a/support-files/debian/mysql-server-shared.postrm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -update-alternatives --auto mysqld diff --git a/support-files/debian/mysql-server.conffiles b/support-files/debian/mysql-server.conffiles deleted file mode 100644 index 5f4599b273c..00000000000 --- a/support-files/debian/mysql-server.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/init.d/mysql -/etc/my.cnf diff --git a/support-files/debian/mysql-server.dirs b/support-files/debian/mysql-server.dirs deleted file mode 100644 index 067eddeefad..00000000000 --- a/support-files/debian/mysql-server.dirs +++ /dev/null @@ -1,2 +0,0 @@ -etc/init.d -var/mysql diff --git a/support-files/debian/mysql-server.postinst b/support-files/debian/mysql-server.postinst deleted file mode 100644 index ef2f32dac19..00000000000 --- a/support-files/debian/mysql-server.postinst +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -update-rc.d mysql defaults 50 >/dev/null - -#-------- -update-alternatives --install /usr/sbin/mysqld mysqld /usr/sbin/mysqld-static 10 - -#-------- - -DOFIX=0 -if [ ! -e /var/mysql/data/mysql/tables_priv.frm -a -d /var/mysql/data/mysql ]; then - DOFIX=1 -fi - -#-------- -i=`grep '^mysql:' /etc/group` -if [ "x${i}" == "x" ]; then - groupadd mysql || true -fi - -i=`grep '^mysql:' /etc/passwd` -if [ "x${i}" == "x" ]; then - useradd -g mysql -d /var/mysql/data -s /noexists mysql || true -fi - -#-------- - -if [ ! -d /var/mysql/data/mysql ]; then - install -d /var/mysql/data || true - /usr/sbin/mysql_install_db || true - chown -R mysql.mysql /var/mysql -fi - -#-------- -/etc/init.d/mysql start || true - -if [ $DOFIX -eq 1 ]; then - echo "***************************************" - echo " Now, fix tables for MySQL 3.22.11...." - echo " if you set root passwd, please in..." - echo -n " ? MySQL root passwd ? : " - read pass dumy - /usr/sbin/mysql_fix_privilege_tables $pass -fi diff --git a/support-files/debian/mysql-server.postrm b/support-files/debian/mysql-server.postrm deleted file mode 100644 index d493a73a04a..00000000000 --- a/support-files/debian/mysql-server.postrm +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -update-alternatives --auto mysqld - -if [ "$1" = "purge" ] -then - update-rc.d mysql remove >/dev/null - - echo -n " Shall I also remove all of the databases (y/N)?"; read ans - if [ "$ans" = "y" -o "$ans" = "Y" ]; then - rm -rf /var/mysql - fi -fi diff --git a/support-files/debian/mysql-server.prerm b/support-files/debian/mysql-server.prerm deleted file mode 100644 index 569739ca00d..00000000000 --- a/support-files/debian/mysql-server.prerm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/etc/init.d/mysql stop || true diff --git a/support-files/debian/patches/aa b/support-files/debian/patches/aa deleted file mode 100644 index 288197370be..00000000000 --- a/support-files/debian/patches/aa +++ /dev/null @@ -1,11 +0,0 @@ ---- mysql-3.23.23.orig/sql/Makefile.in -+++ mysql-3.23.23/sql/Makefile.in -@@ -366,7 +366,7 @@ - - mysqlbinlog: $(mysqlbinlog_OBJECTS) $(mysqlbinlog_DEPENDENCIES) - @rm -f mysqlbinlog -- $(CXXLINK) $(mysqlbinlog_LDFLAGS) $(mysqlbinlog_OBJECTS) $(mysqlbinlog_LDADD) $(LIBS) -+ $(CXXLINK) $(mysqld_LDFLAGS) $(mysqlbinlog_OBJECTS) $(mysqld_LDADD) $(LIBS) - - mysqld: $(mysqld_OBJECTS) $(mysqld_DEPENDENCIES) - @rm -f mysqld diff --git a/support-files/debian/patches/ab b/support-files/debian/patches/ab deleted file mode 100644 index e169ee38188..00000000000 --- a/support-files/debian/patches/ab +++ /dev/null @@ -1,11 +0,0 @@ ---- mysql-3.23.34a/sql/Makefile.in.orig Mon Mar 12 08:27:39 2001 -+++ mysql-3.23.34a/sql/Makefile.in Thu Mar 15 04:11:14 2001 -@@ -373,7 +373,7 @@ - - mysqlbinlog: $(mysqlbinlog_OBJECTS) $(mysqlbinlog_DEPENDENCIES) - @rm -f mysqlbinlog -- $(CXXLINK) $(mysqlbinlog_LDFLAGS) $(mysqlbinlog_OBJECTS) $(mysqlbinlog_LDADD) $(LIBS) -+ $(CXXLINK) $(mysqld_LDFLAGS) $(mysqlbinlog_OBJECTS) $(mysqld_LDADD) $(LIBS) - - mysqld: $(mysqld_OBJECTS) $(mysqld_DEPENDENCIES) - @rm -f mysqld diff --git a/support-files/debian/patches/ac b/support-files/debian/patches/ac deleted file mode 100644 index 8cc2cd5dff1..00000000000 --- a/support-files/debian/patches/ac +++ /dev/null @@ -1,8 +0,0 @@ ---- mysql-3.23.23.orig/scripts/msql2mysql.sh -+++ mysql-3.23.23/scripts/msql2mysql.sh -@@ -13,4 +13,4 @@ - # described in the License. Among other things, the License requires that - # the copyright notice and this notice be preserved on all copies. - --@bindir@/replace msqlConnect mysql_connect msqlListDBs mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db msqlFieldSeek mysql_field_seek -- $* -+@bindir@/mysql_replace msqlConnect mysql_connect msqlListDBs mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db msqlFieldSeek mysql_field_seek -- $* diff --git a/support-files/debian/patches/ad b/support-files/debian/patches/ad deleted file mode 100644 index 25394116ad9..00000000000 --- a/support-files/debian/patches/ad +++ /dev/null @@ -1,11 +0,0 @@ ---- mysql-3.23.34a/scripts/mysql_install_db.sh.orig Mon Mar 12 08:18:27 2001 -+++ mysql-3.23.34a/scripts/mysql_install_db.sh Thu Mar 15 04:12:28 2001 -@@ -325,7 +325,7 @@ - if test "$IN_RPM" -eq 0 - then - echo "You can start the MySQL daemon with:" -- echo "cd @prefix@ ; $bindir/safe_mysqld &" -+ echo "cd @prefix@ ; $sbindir/safe_mysqld &" - echo - echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:" - echo "cd sql-bench ; run-all-tests" diff --git a/support-files/debian/patches/ae b/support-files/debian/patches/ae deleted file mode 100644 index 7ea5733147f..00000000000 --- a/support-files/debian/patches/ae +++ /dev/null @@ -1,35 +0,0 @@ ---- mysql-3.23.30-gamma/support-files/mysql.server.sh.orig Thu Jan 4 11:03:57 2001 -+++ mysql-3.23.30-gamma/support-files/mysql.server.sh Sat Jan 6 12:18:50 2001 -@@ -28,8 +28,10 @@ - then - basedir=@prefix@ - bindir=@bindir@ -+ sbindir=@sbindir@ - else - bindir="$basedir/bin" -+ sbindir="$basedir/sbin" - fi - if test -z "$pid_file" - then -@@ -100,18 +102,18 @@ - 'start') - # Start daemon - -- if test -x $bindir/safe_mysqld -+ if test -x $sbindir/safe_mysqld - then - # Give extra arguments to mysqld with the my.cnf file. This script may - # be overwritten at next upgrade. -- $bindir/safe_mysqld --datadir=$datadir --pid-file=$pid_file & -+ $sbindir/safe_mysqld --datadir=$datadir --pid-file=$pid_file & - # Make lock for RedHat / SuSE - if test -w /var/lock/subsys - then - touch /var/lock/subsys/mysql - fi - else -- echo "Can't execute $bindir/safe_mysqld" -+ echo "Can't execute $sbindir/safe_mysqld" - fi - ;; - diff --git a/support-files/debian/patches/az b/support-files/debian/patches/az deleted file mode 100644 index 0795946de32..00000000000 --- a/support-files/debian/patches/az +++ /dev/null @@ -1,39 +0,0 @@ ---- mysql-3.23.23.orig/configure -+++ mysql-3.23.23/configure -@@ -202,7 +202,7 @@ - --with-charset=CHARSET use CHARSET by default (one of: big5 cp1251 cp1257 - croat czech danish dec8 dos estonia euc_kr gb2312 gbk - german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr -- latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr -+ latin1 latin2 swe7 usa7 win1250 win1251ukr - ujis sjis tis620; default is latin1)" - ac_help="$ac_help - --with-extra-charsets=cs1,cs2 -@@ -8843,7 +8843,7 @@ - - # Choose a character set - --CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr ujis sjis tis620" -+CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 swe7 usa7 win1250 win1251ukr ujis sjis tis620" - DEFAULT_CHARSET=latin1 - - # Check whether --with-charset or --without-charset was given. ---- mysql-3.23.23.orig/configure.in -+++ mysql-3.23.23/configure.in -@@ -1517,14 +1517,14 @@ - dnl or other special handling, you must also create - dnl strings/ctype-$charset_name.c - --CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr ujis sjis tis620" -+CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 swe7 usa7 win1250 win1251ukr ujis sjis tis620" - DEFAULT_CHARSET=latin1 - - AC_ARG_WITH(charset, - [ --with-charset=CHARSET use CHARSET by default (one of: big5 cp1251 cp1257 - croat czech danish dec8 dos estonia euc_kr gb2312 gbk - german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr -- latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr -+ latin1 latin2 swe7 usa7 win1250 win1251ukr - ujis sjis tis620; default is latin1)], - [default_charset="$withval"], - [default_charset="$DEFAULT_CHARSET"]) diff --git a/support-files/debian/patches/ta b/support-files/debian/patches/ta deleted file mode 100644 index b27259f4473..00000000000 --- a/support-files/debian/patches/ta +++ /dev/null @@ -1,68 +0,0 @@ ---- mysql-3.23.34a/mysql-test/install_test_db.sh.orig Mon Mar 12 08:18:24 2001 -+++ mysql-3.23.34a/mysql-test/install_test_db.sh Thu Mar 15 04:11:14 2001 -@@ -5,6 +5,15 @@ - # This scripts creates the privilege tables db, host, user, tables_priv, - # columns_priv in the mysql database, as well as the func table. - -+if [ x$1 = x"-debian" ]; then -+ DEBIAN=1 -+ shift 1 -+ execdir=/usr/sbin -+ bindir=/usr/bin -+ BINARY_DIST=1 -+ fix_bin=/var/mysql/mysql-test -+else -+ - if [ x$1 = x"-bin" ]; then - shift 1 - execdir=../bin -@@ -17,6 +26,10 @@ - fix_bin=. - fi - -+fi -+ -+ -+ - vardir=var - logdir=$vardir/log - if [ x$1 = x"-slave" ] -@@ -47,12 +60,17 @@ - #create the directories - [ -d $vardir ] || mkdir $vardir - [ -d $logdir ] || mkdir $logdir -+[ "x$RUN_USER" != "x" ] && chown -R $RUN_USER $logdir - - # Create database directories mysql & test - if [ -d $data ] ; then rm -rf $data ; fi - mkdir $data $data/mysql $data/test - - #for error messages -+if [ "x$DEBIAN" = "x1" ]; then -+ basedir=/usr -+else -+ - if [ x$BINARY_DIST = x1 ] ; then - basedir=.. - else -@@ -62,6 +80,10 @@ - ln -sf ../../sql/share share/mysql - fi - -+fi -+ -+ -+ - # Initialize variables - c_d="" i_d="" - c_h="" i_h="" -@@ -211,7 +233,9 @@ - $c_c - END_OF_DATA - then -+ [ "x$RUN_USER" != "x" ] && chown -R $RUN_USER $ldata - exit 0 - else -+ [ "x$RUN_USER" != "x" ] && chown -R $RUN_USER $ldata - exit 1 - fi diff --git a/support-files/debian/patches/tb b/support-files/debian/patches/tb deleted file mode 100644 index c3890dcab62..00000000000 --- a/support-files/debian/patches/tb +++ /dev/null @@ -1,86 +0,0 @@ ---- mysql-3.23.34a/mysql-test/mysql-test-run.sh.orig Mon Mar 12 08:18:27 2001 -+++ mysql-3.23.34a/mysql-test/mysql-test-run.sh Thu Mar 15 04:11:14 2001 -@@ -37,9 +37,23 @@ - XARGS=`which xargs | head -1` - SED=sed - -+if [ $USER = root ]; then -+ RUN_USER="mysql" -+ RUN_USER_OPT="--user=$RUN_USER" -+ export RUN_USER -+fi -+ -+ - # Are we using a source or a binary distribution? - - testdir=@testdir@ -+ -+if [ -d /var/mysql/mysql-test ]; then -+ DEBIAN=1 -+ cd /var/mysql/mysql-test -+ testdir=/var/mysql -+fi -+ - if [ -d bin/mysqld ] && [ -d mysql-test ] ; then - cd mysql-test - else -@@ -56,6 +70,10 @@ - exit 1 - fi - -+if [ x$DEBIAN = x1 ]; then -+ MY_BASEDIR=/usr -+fi -+ - #++ - # Misc. Definitions - #-- -@@ -184,12 +202,21 @@ - [ -d $MYSQL_TEST_DIR/var ] || mkdir $MYSQL_TEST_DIR/var - [ -d $MYSQL_TEST_DIR/var/tmp ] || mkdir $MYSQL_TEST_DIR/var/tmp - [ -d $MYSQL_TEST_DIR/var/run ] || mkdir $MYSQL_TEST_DIR/var/run -+[ -d $MYSQL_TEST_DIR -a "x$RUN_USER" != "x" ] && chown -R $RUN_USER $MYSQL_TEST_DIR - - [ -z "$COLUMNS" ] && COLUMNS=80 - E=`$EXPR $COLUMNS - 8` - #DASH72=`expr substr '------------------------------------------------------------------------' 1 $E` - DASH72=`$ECHO '------------------------------------------------------------------------'|$CUT -c 1-$E` - -+if [ "x$DEBIAN" = "x1" ]; then -+ MYSQLD="/usr/sbin/mysqld" -+ MYSQL_TEST="/usr/sbin/mysqltest" -+ MYSQLADMIN="/usr/bin/mysqladmin" -+ INSTALL_DB="/var/mysql/mysql-test/install_test_db -debian" -+ -+else -+ - # on source dist, we pick up freshly build executables - # on binary, use what is installed - if [ x$SOURCE_DIST = x1 ] ; then -@@ -250,6 +277,8 @@ - read unused - } - -+fi -+ - - error () { - $ECHO "Error: $1" -@@ -365,7 +394,7 @@ - --language=english \ - --innobase_data_file_path=ibdata1:50M \ - $SMALL_SERVER \ -- $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT" -+ $RUN_USER_OPT $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT" - if [ x$DO_DDD = x1 ] - then - $ECHO "set args $master_args" > $GDB_MASTER_INIT -@@ -420,7 +449,7 @@ - --language=english \ - --skip-innobase \ - $SMALL_SERVER \ -- $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT" -+ $RUN_USER_OPT $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT" - if [ x$DO_DDD = x1 ] - then - $ECHO "set args $master_args" > $GDB_SLAVE_INIT diff --git a/support-files/debian/rules b/support-files/debian/rules deleted file mode 100755 index c03e7fd1742..00000000000 --- a/support-files/debian/rules +++ /dev/null @@ -1,232 +0,0 @@ -#!/usr/bin/make -f -# Made with the aid of debmake, by Christoph Lameter, -# based on the sample debian/rules file for GNU hello by Ian Jackson. - -package=mysql -CHARSET=ujis -SYSNAME= - -TEMPINST=build - -# CFLAGS="-O6 -mpentium -mstack-align-double -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -mpentium -mstack-align-double -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static - -CC=gcc -CFLAGS=-O6 -fomit-frame-pointer -CXX=gcc -CXXFLAGS=-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -# CXXFLAGS=-O6 -fomit-frame-pointer -felide-constructors -fno-rtti - -COMMONCONF= --prefix=/usr --libexecdir=/usr/sbin \ - --localstatedir=/var/mysql/data \ - --enable-shared \ - --without-perl --without-readline \ - --without-docs --without-bench \ - --with-mysqld-user=mysql \ - --with-extra-charsets=all - -SERVERCONF=$(COMMONCONF) --enable-assembler \ - --with-raid - -MYSQLMAXCONF= --with-server-suffix=-Max \ - --with-innodb \ - --with-berkeley-db - -# --with-gemini \ - -# --with-berkeley-db-includes=/usr/include/db3 \ -# --with-berkeley-db-libs=/usr/lib - -STATICCONF=--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static - -CLIENTCONF=$(COMMONCONF) --without-server - -################################################## -patches debian/stamp-patches: - -test -e debian/stamp-patches || \ - for i in `find debian/patches -type f -print` ; do \ - echo "==== $$i ====" ; \ - patch -p1 < $$i ; \ - done - touch debian/stamp-patches - -################################################## -premkdir debian/stamp-premkdir: - $(checkdir) - -rm -rf debian/tmp debian/$(TEMPINST)* - dh_installdirs - - for i in '' -shared -debug -max -max-shared -max-debug ; do \ - install -d debian/$(TEMPINST)$${i}/usr/{bin,sbin,share,man,include,info} ; \ - done - -# -install -d debian/$(TEMPINST)$${i}/usr/{bin,sbin,share,man,include,info} -# -install -d debian/$(TEMPINST)-shared/usr/{bin,sbin,share,man,include,info} -# -install -d debian/$(TEMPINST)-debug/usr/{bin,sbin,share,man,include,info} - - touch debian/stamp-premkdir - -################################################## -config debian/stamp-config: debian/stamp-premkdir debian/stamp-patches - CC=$(CC) CFLAGS="$(CFLAGS)" CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" \ - LDFLAGS="-static" \ - ./configure $(SERVERCONF) $(STATICCONF) \ - --with-charset=$(CHARSET) \ - --with-bench \ - $(SYSNAME) - -# sed 's/-fno-implicit-templates//g' sql/Makefile > .m -# mv .m sql/Makefile - touch debian/stamp-config - -################################################## -build: debian/stamp-config - make LDFLAGS="-static" - make install DESTDIR=`pwd`/debian/$(TEMPINST) - cp include/m_ctype.h `pwd`/debian/$(TEMPINST)/usr/include/mysql/ - touch build - -################################################## -build-shared debian/stamp-build-shared: debian/stamp-patches - -make distclean - CC=$(CC) CFLAGS="$(CFLAGS)" CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" \ - ./configure $(SERVERCONF) \ - --with-charset=$(CHARSET) \ - $(SYSNAME) - -# ./configure $(CLIENTCONF) - - make - make install DESTDIR=`pwd`/debian/$(TEMPINST)-shared - - touch debian/stamp-build-shared - -################################################## -build-debug debian/stamp-build-debug: debian/stamp-patches - -make distclean - CC=$(CC) CFLAGS="$(CFLAGS)" CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" \ - ./configure $(SERVERCONF) \ - --with-charset=$(CHARSET) \ - --with-debug \ - $(SYSNAME) - -# ./configure $(CLIENTCONF) - - make - make install DESTDIR=`pwd`/debian/$(TEMPINST)-debug - - touch debian/stamp-build-debug - -################################################## -debian/stamp-mysql-max: debian/stamp-mysql-max-static debian/stamp-mysql-max-shared debian/stamp-mysql-max-debug - -debian/stamp-mysql-max-static: debian/stamp-premkdir debian/stamp-patches - -make distclean - CC=$(CC) CFLAGS="$(CFLAGS)" CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" \ - ./configure $(SERVERCONF) $(STATICCONF) \ - $(MYSQLMAXCONF) \ - --with-charset=$(CHARSET) \ - $(SYSNAME) - - make LDFLAGS="-static" - make install DESTDIR=`pwd`/debian/$(TEMPINST)-max - - touch debian/stamp-mysql-max-static - -debian/stamp-mysql-max-shared: debian/stamp-premkdir debian/stamp-patches - -make distclean - CC=$(CC) CFLAGS="$(CFLAGS)" CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" \ - ./configure $(SERVERCONF) \ - $(MYSQLMAXCONF) \ - --with-charset=$(CHARSET) \ - $(SYSNAME) - - make - make install DESTDIR=`pwd`/debian/$(TEMPINST)-max-shared - - touch debian/stamp-mysql-max-shared - - -debian/stamp-mysql-max-debug: debian/stamp-premkdir debian/stamp-patches - -make distclean - CC=$(CC) CFLAGS="$(CFLAGS)" CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" \ - ./configure $(SERVERCONF) \ - $(MYSQLMAXCONF) \ - --with-charset=$(CHARSET) \ - --with-debug \ - $(SYSNAME) - - make - make install DESTDIR=`pwd`/debian/$(TEMPINST)-max-debug - - touch debian/stamp-mysql-max-debug - - -################################################## -clean: - $(checkdir) - -make distclean - -test -e debian/stamp-patches && \ - for i in `find debian/patches -type f -print` ; do \ - patch -R -p1 < $$i ; \ - done - -rm -rf build debian/stamp-* debian/$(TEMPINST)* - -dh_clean - -rm -f `find . -name "*~"` - -rm -rf debian/tmp debian/files* core - -rm -f debian/*substvars - -rm -f `cat debian/gomi` - -################################################## -binary-indep: checkroot build - $(checkdir) -# There are no architecture-independent files to be uploaded -# generated by this package. If there were any they would be -# made here. - -binary-arch: checkroot build debian/stamp-build-shared debian/stamp-build-debug debian/stamp-mysql-max - sh debian/move - -### init, post* - dh_installdeb - cp debian/shlibs debian/libmysqlclient10/DEBIAN/ - - cp debian/my.cnf debian/mysql-server/etc/ - cp support-files/mysql.server debian/mysql-server/etc/init.d/mysql ; chmod +x debian/mysql-server/etc/init.d/mysql - -### dpkg-xxx - dh_compress - - dh_fixperms - - dh_strip - - dh_shlibdeps - dh_gencontrol - - dpkg --build debian/libmysqlclient10 .. - dpkg --build debian/mysql-client .. - dpkg --build debian/mysql-server .. - dpkg --build debian/mysql-server-shared .. - dpkg --build debian/mysql-server-debug .. - dpkg --build debian/mysql-dev .. - dpkg --build debian/mysql-bench .. - dpkg --build debian/mysql-doc .. - dpkg --build debian/mysql-max .. - dpkg --build debian/mysql-max-shared .. - dpkg --build debian/mysql-max-debug .. - -define checkdir - test -f debian/rules -endef - -# Below here is fairly generic really - -binary: binary-indep binary-arch - -################################################## -checkroot: - $(checkdir) - test root = "`whoami`" - -################################################## -.PHONY: binary binary-arch binary-indep clean checkroot diff --git a/support-files/debian/shlibs b/support-files/debian/shlibs deleted file mode 100644 index 5500d337df9..00000000000 --- a/support-files/debian/shlibs +++ /dev/null @@ -1 +0,0 @@ -libmysqlclient 10 libmysqlclient10 diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index 5dc3e5a1900..31221ece0ee 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -114,10 +114,6 @@ server-id = 1 #tmpdir = /tmp/ #log-update = /path-to-dedicated-directory/hostname -# Uncomment the following if you are using BDB tables -#bdb_cache_size = 384M -#bdb_max_lock = 100000 - # Uncomment the following if you are using InnoDB tables #innodb_data_home_dir = @localstatedir@/ #innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh index 77c6cea56d5..cc11ebfe63f 100644 --- a/support-files/my-innodb-heavy-4G.cnf.sh +++ b/support-files/my-innodb-heavy-4G.cnf.sh @@ -357,14 +357,6 @@ myisam_repair_threads = 1 myisam_recover -# *** BDB Specific options *** - -# Use this option if you run a MySQL server with BDB support enabled but -# you do not plan to use it. This will save memory and may speed up some -# things. -skip-bdb - - # *** INNODB Specific options *** # Use this option if you have a MySQL server with InnoDB support enabled diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh index 4dc3f929c48..6fa4c21f96b 100644 --- a/support-files/my-large.cnf.sh +++ b/support-files/my-large.cnf.sh @@ -114,10 +114,6 @@ server-id = 1 #tmpdir = /tmp/ #log-update = /path-to-dedicated-directory/hostname -# Uncomment the following if you are using BDB tables -#bdb_cache_size = 64M -#bdb_max_lock = 100000 - # Uncomment the following if you are using InnoDB tables #innodb_data_home_dir = @localstatedir@/ #innodb_data_file_path = ibdata1:10M:autoextend diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh index 99b6e823f39..4a7bfcfc775 100644 --- a/support-files/my-medium.cnf.sh +++ b/support-files/my-medium.cnf.sh @@ -112,10 +112,6 @@ server-id = 1 #tmpdir = /tmp/ #log-update = /path-to-dedicated-directory/hostname -# Uncomment the following if you are using BDB tables -#bdb_cache_size = 4M -#bdb_max_lock = 10000 - # Uncomment the following if you are using InnoDB tables #innodb_data_home_dir = @localstatedir@/ #innodb_data_file_path = ibdata1:10M:autoextend diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh index 288df893b4c..cfaca64c293 100644 --- a/support-files/my-small.cnf.sh +++ b/support-files/my-small.cnf.sh @@ -48,9 +48,6 @@ server-id = 1 # Uncomment the following if you want to log updates #log-bin=mysql-bin -# Uncomment the following if you are NOT using BDB tables -#skip-bdb - # Uncomment the following if you are using InnoDB tables #innodb_data_home_dir = @localstatedir@/ #innodb_data_file_path = ibdata1:10M:autoextend diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index f5fa4e9ed9a..b84ae85f524 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -276,7 +276,10 @@ case "$mode" in fi # Give extra arguments to mysqld with the my.cnf file. This script may # be overwritten at next upgrade. - $manager --user=$user --pid-file=$pid_file >/dev/null 2>&1 & + "$manager" \ + --mysqld-safe-compatible \ + --user="$user" \ + --pid-file="$pid_file" >/dev/null 2>&1 & wait_for_pid created # Make lock for RedHat / SuSE diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 59369f0de35..a75e652cd29 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -1,3 +1,4 @@ + %define mysql_version @VERSION@ # use "rpmbuild --with static" or "rpm --define '_with_static 1'" (for RPM 3.x) @@ -131,8 +132,6 @@ Group: Applications/Databases This package contains the ndbcluster storage engine. It is necessary to have this package installed on all computers that should store ndbcluster table data. -Note that this storage engine can only be used in conjunction -with the MySQL Max server. %{see_base} @@ -166,16 +165,16 @@ They should be used with caution. %{see_base} -%package bench +%package test Requires: %{name}-client perl-DBI perl -Summary: MySQL - Benchmarks and test system +Summary: MySQL - Test suite Group: Applications/Databases -Provides: mysql-bench -Obsoletes: mysql-bench +Provides: mysql-test +Obsoletes: mysql-bench mysql-test AutoReqProv: no -%description bench -This package contains MySQL benchmark scripts and data. +%description test +This package contains the MySQL regression test suite. %{see_base} @@ -194,57 +193,36 @@ necessary to develop MySQL client applications. %package shared Summary: MySQL - Shared libraries Group: Applications/Databases -Provides: mysql-shared -Obsoletes: mysql-shared %description shared This package contains the shared libraries (*.so*) which certain languages and applications need to dynamically load and use MySQL. -%package Max -Summary: MySQL - server with extended functionality +%package embedded +Requires: %{name}-devel +Summary: MySQL - embedded library Group: Applications/Databases -Provides: mysql-Max -Obsoletes: mysql-Max -Requires: MySQL-server >= @MYSQL_BASE_VERSION@ - -%description Max -Optional MySQL server binary that supports additional features like: - - - Berkeley DB Storage Engine - - Ndbcluster Storage Engine interface - - Archive Storage Engine - - CSV Storage Engine - - Example Storage Engine - - Federated Storage Engine - - User Defined Functions (UDFs). - -To activate this binary, just install this package in addition to -the standard MySQL package. - -Please note that this is a dynamically linked binary! - -#%package embedded -#Requires: %{name}-devel -#Summary: MySQL - embedded library -#Group: Applications/Databases -#Obsoletes: mysql-embedded -# -#%description embedded -#This package contains the MySQL server as an embedded library. -# -#The embedded MySQL server library makes it possible to run a -#full-featured MySQL server inside the client application. -#The main benefits are increased speed and more simple management -#for embedded applications. -# -#The API is identical for the embedded MySQL version and the -#client/server version. -# -#%{see_base} +Obsoletes: mysql-embedded + +%description embedded +This package contains the MySQL server as an embedded library. + +The embedded MySQL server library makes it possible to run a +full-featured MySQL server inside the client application. +The main benefits are increased speed and more simple management +for embedded applications. + +The API is identical for the embedded MySQL version and the +client/server version. + +%{see_base} %prep -%setup -n mysql-%{mysql_version} +# We unpack the source two times, for 'debug' and 'release' build. +%setup -T -a 0 -c -n mysql-%{mysql_version} +mv mysql-%{mysql_version} mysql-debug-%{mysql_version} +%setup -D -T -a 0 -n mysql-%{mysql_version} +mv mysql-%{mysql_version} mysql-release-%{mysql_version} %build @@ -254,21 +232,24 @@ BuildMySQL() { sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ CC=\"${CC:-$MYSQL_BUILD_CC}\" \ CXX=\"${CXX:-$MYSQL_BUILD_CXX}\" \ - CFLAGS=\"${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS}\" \ - CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS \ - -felide-constructors -fno-exceptions -fno-rtti \ - }\" \ + CFLAGS=\"$CFLAGS\" \ + CXXFLAGS=\"$CXXFLAGS\" \ LDFLAGS=\"$MYSQL_BUILD_LDFLAGS\" \ ./configure \ $* \ + --with-mysqld-ldflags='-static' \ + --with-client-ldflags='-static' \ + --with-zlib-dir=bundled \ --enable-assembler \ --enable-local-infile \ + --with-fast-mutexes \ --with-mysqld-user=%{mysqld_user} \ --with-unix-socket-path=/var/lib/mysql/mysql.sock \ --with-pic \ --prefix=/ \ + --with-extra-charsets=all \ %if %{YASSL_BUILD} - --with-yassl \ + --with-ssl \ %endif --exec-prefix=%{_exec_prefix} \ --libexecdir=%{_sbindir} \ @@ -280,13 +261,9 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ --includedir=%{_includedir} \ --mandir=%{_mandir} \ --enable-thread-safe-client \ - --with-readline ; \ - # Add this for more debugging support - # --with-debug + --with-readline \ " - - # benchdir does not fit in above model. Maybe a separate bench distribution - make benchdir_root=$RPM_BUILD_ROOT/usr/share/ + make } # Use our own copy of glibc @@ -301,7 +278,6 @@ fi # Use the build root for temporary storage of the shared libraries. RBR=$RPM_BUILD_ROOT -MBD=$RPM_BUILD_DIR/mysql-%{mysql_version} # Clean up the BuildRoot first [ "$RBR" != "/" ] && [ -d $RBR ] && rm -rf $RBR; @@ -313,8 +289,7 @@ mkdir -p $RBR%{_libdir}/mysql PATH=${MYSQL_BUILD_PATH:-/bin:/usr/bin} export PATH -# Build the Max binary (includes BDB and UDFs and therefore -# cannot be linked statically against the patched glibc) +# Build the Debug binary. # Use gcc for C and C++ code (to avoid a dependency on libstdc++ and # including exceptions into the code @@ -324,9 +299,18 @@ then export CXX="gcc" fi +############################################################################## +# +# Build the debug version +# +############################################################################## + +# Strip -Oxxx, add -g and --with-debug. +(cd mysql-debug-%{mysql_version} && +CFLAGS=`echo "${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS} -g" | sed -e 's/-O[0-9]*//g'` \ +CXXFLAGS=`echo "${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti} -g" | sed -e 's/-O[0-9]*//g'` \ BuildMySQL "--enable-shared \ - --with-extra-charsets=all \ - --with-berkeley-db \ + --with-debug \ --with-innodb \ --with-ndbcluster \ --with-archive-storage-engine \ @@ -334,129 +318,96 @@ BuildMySQL "--enable-shared \ --with-example-storage-engine \ --with-blackhole-storage-engine \ --with-federated-storage-engine \ + --with-partition \ --with-big-tables \ - --with-comment=\"MySQL Community Edition - Experimental (GPL)\" \ - --with-server-suffix='-max'" + --with-comment=\"MySQL Community Server - Debug (GPL)\"") # We might want to save the config log file -if test -n "$MYSQL_MAXCONFLOG_DEST" +if test -n "$MYSQL_DEBUGCONFLOG_DEST" then - cp -fp config.log "$MYSQL_MAXCONFLOG_DEST" + cp -fp mysql-debug-%{mysql_version}/config.log "$MYSQL_DEBUGCONFLOG_DEST" fi -( cd mysql-test - perl ./mysql-test-run.pl --force --report-features - perl ./mysql-test-run.pl --force --ps-protocol - true ) - -# Save mysqld-max -./libtool --mode=execute cp sql/mysqld sql/mysqld-max -./libtool --mode=execute nm --numeric-sort sql/mysqld-max > sql/mysqld-max.sym - -# Save the perror binary so it supports the NDB error codes (BUG#13740) -./libtool --mode=execute cp extra/perror extra/perror.ndb - -# Install the ndb binaries -(cd ndb; make install DESTDIR=$RBR) - -# Include libgcc.a in the devel subpackage (BUG 4921) -if expr "$CC" : ".*gcc.*" > /dev/null ; -then - libgcc=`$CC --print-libgcc-file` - if [ -f $libgcc ] - then - %define have_libgcc 1 - install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a - fi -fi - -# Save libraries -(cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*) -(cd libmysql_r/.libs; tar rf $RBR/shared-libs.tar *.so*) -(cd ndb/src/.libs; tar rf $RBR/shared-libs.tar *.so*) - -# Now clean up -make clean +(cd mysql-debug-%{mysql_version}/mysql-test ; \ + ./mysql-test-run.pl --comment=debug --skip-rpl --skip-ndbcluster --force --report-features ; \ + true) +############################################################################## # -# Only link statically on our i386 build host (which has a specially -# patched static glibc installed) - ia64 and x86_64 run glibc-2.3 (unpatched) -# so don't link statically there +# Build the release binary # -BuildMySQL "--disable-shared \ -%if %{STATIC_BUILD} - --with-mysqld-ldflags='-all-static' \ - --with-client-ldflags='-all-static' \ - $USE_OTHER_LIBC_DIR \ -%else - --with-zlib-dir=bundled \ -%endif - --with-extra-charsets=complex \ - --with-comment=\"MySQL Community Edition - Standard (GPL)\" \ - --with-server-suffix='%{server_suffix}' \ - --with-archive-storage-engine \ - --with-innodb \ - --with-big-tables" - -./libtool --mode=execute nm --numeric-sort sql/mysqld > sql/mysqld.sym +############################################################################## +(cd mysql-release-%{mysql_version} && +CFLAGS="${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS} -g" \ +CXXFLAGS="${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti} -g" \ +BuildMySQL "--enable-shared \ + --with-innodb \ + --with-ndbcluster \ + --with-archive-storage-engine \ + --with-csv-storage-engine \ + --with-example-storage-engine \ + --with-blackhole-storage-engine \ + --with-federated-storage-engine \ + --with-partition \ + --with-embedded-server \ + --with-big-tables \ + --with-comment=\"MySQL Community Server (GPL)\"") # We might want to save the config log file if test -n "$MYSQL_CONFLOG_DEST" then - cp -fp config.log "$MYSQL_CONFLOG_DEST" + cp -fp mysql-release-%{mysql_version}/config.log "$MYSQL_CONFLOG_DEST" fi -( cd mysql-test - perl ./mysql-test-run.pl --force --report-features - perl ./mysql-test-run.pl --force --ps-protocol - true ) +cd mysql-release-%{mysql_version}/mysql-test +./mysql-test-run.pl --comment=normal --force --skip-ndbcluster --timer --report-features || true +./mysql-test-run.pl --comment=ps --ps-protocol --force --skip-ndbcluster --timer || true +./mysql-test-run.pl --comment=normal+rowrepl --mysqld=--binlog-format=row --force --skip-ndbcluster --timer || true +./mysql-test-run.pl --comment=ps+rowrepl+NDB --ps-protocol --mysqld=--binlog-format=row --force --timer || true +./mysql-test-run.pl --comment=NDB --with-ndbcluster-only --force --timer || true +cd ../.. + +############################################################################## %install RBR=$RPM_BUILD_ROOT -MBD=$RPM_BUILD_DIR/mysql-%{mysql_version} +MBD=$RPM_BUILD_DIR/mysql-%{mysql_version}/mysql-release-%{mysql_version} # Ensure that needed directories exists install -d $RBR%{_sysconfdir}/{logrotate.d,init.d} install -d $RBR%{mysqldatadir}/mysql -install -d $RBR%{_datadir}/{sql-bench,mysql-test} +install -d $RBR%{_datadir}/mysql-test install -d $RBR%{_includedir} install -d $RBR%{_libdir} install -d $RBR%{_mandir} install -d $RBR%{_sbindir} -# Install all binaries stripped -make install-strip DESTDIR=$RBR benchdir_root=%{_datadir} +# Install all binaries +(cd $MBD && make install DESTDIR=$RBR benchdir_root=%{_datadir}) +# Old packages put shared libs in %{_libdir}/ (not %{_libdir}/mysql), so do +# the same here. +mv $RBR/%{_libdir}/mysql/*.so* $RBR/%{_libdir}/ -# Install shared libraries (Disable for architectures that don't support it) -(cd $RBR%{_libdir}; tar xf $RBR/shared-libs.tar; rm -f $RBR/shared-libs.tar) - -# install saved mysqld-max -install -s -m 755 $MBD/sql/mysqld-max $RBR%{_sbindir}/mysqld-max +# install "mysqld-debug" +$MBD/libtool --mode=execute install -m 755 \ + $RPM_BUILD_DIR/mysql-%{mysql_version}/mysql-debug-%{mysql_version}/sql/mysqld \ + $RBR%{_sbindir}/mysqld-debug # install saved perror binary with NDB support (BUG#13740) -install -s -m 755 $MBD/extra/perror.ndb $RBR%{_bindir}/perror - -# install symbol files ( for stack trace resolution) -install -m 644 $MBD/sql/mysqld-max.sym $RBR%{_libdir}/mysql/mysqld-max.sym -install -m 644 $MBD/sql/mysqld.sym $RBR%{_libdir}/mysql/mysqld.sym +install -m 755 $MBD/extra/perror $RBR%{_bindir}/perror # Install logrotate and autostart install -m 644 $MBD/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql install -m 755 $MBD/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql # Install embedded server library in the build root -# FIXME No libmysqld on 5.0 yet -#install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/ +install -m 644 $MBD/libmysqld/libmysqld.a $RBR%{_libdir}/mysql/ # Create a symlink "rcmysql", pointing to the init.script. SuSE users # will appreciate that, as all services usually offer this. ln -s %{_sysconfdir}/init.d/mysql $RPM_BUILD_ROOT%{_sbindir}/rcmysql -# Create symbolic compatibility link safe_mysqld -> mysqld_safe -# (safe_mysqld will be gone in MySQL 4.1) -ln -sf ./mysqld_safe $RBR%{_bindir}/safe_mysqld - # Touch the place where the my.cnf config file and mysqlmanager.passwd # (MySQL Instance Manager password file) might be located # Just to make sure it's in the file list and marked as a config file @@ -522,7 +473,7 @@ chmod -R og-rw $mysql_datadir/mysql # Restart in the same way that mysqld will be started normally. %{_sysconfdir}/init.d/mysql start -# Allow safe_mysqld to start mysqld and print a message before we exit +# Allow mysqld_safe to start mysqld and print a message before we exit sleep 2 @@ -533,11 +484,6 @@ mysql_clusterdir=/var/lib/mysql-cluster if test ! -d $mysql_clusterdir; then mkdir -m 755 $mysql_clusterdir; fi -%post Max -# Restart mysqld, to use the new binary. -echo "Restarting mysqld." -%{_sysconfdir}/init.d/mysql restart > /dev/null 2>&1 - %preun server if test $1 = 0 then @@ -569,9 +515,9 @@ fi %files server %defattr(-,root,root,0755) -%doc COPYING README -%doc support-files/my-*.cnf -%doc support-files/ndb-*.ini +%doc mysql-release-%{mysql_version}/COPYING mysql-release-%{mysql_version}/README +%doc mysql-release-%{mysql_version}/support-files/my-*.cnf +%doc mysql-release-%{mysql_version}/support-files/ndb-*.ini %doc %attr(644, root, root) %{_infodir}/mysql.info* @@ -580,7 +526,6 @@ fi %doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1* %doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1* %doc %attr(644, root, man) %{_mandir}/man1/myisampack.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_explain_log.1* %doc %attr(644, root, man) %{_mandir}/man8/mysqld.8* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1* @@ -594,7 +539,6 @@ fi %doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1* %doc %attr(644, root, man) %{_mandir}/man1/perror.1* %doc %attr(644, root, man) %{_mandir}/man1/replace.1* -%doc %attr(644, root, man) %{_mandir}/man1/safe_mysqld.1* %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf %ghost %config(noreplace,missingok) %{_sysconfdir}/mysqlmanager.passwd @@ -606,7 +550,6 @@ fi %attr(755, root, root) %{_bindir}/myisampack %attr(755, root, root) %{_bindir}/mysql_convert_table_format %attr(755, root, root) %{_bindir}/mysql_create_system_tables -%attr(755, root, root) %{_bindir}/mysql_explain_log %attr(755, root, root) %{_bindir}/mysql_fix_extensions %attr(755, root, root) %{_bindir}/mysql_fix_privilege_tables %attr(755, root, root) %{_bindir}/mysql_install_db @@ -625,12 +568,11 @@ fi %attr(755, root, root) %{_bindir}/replace %attr(755, root, root) %{_bindir}/resolve_stack_dump %attr(755, root, root) %{_bindir}/resolveip -%attr(755, root, root) %{_bindir}/safe_mysqld %attr(755, root, root) %{_sbindir}/mysqld +%attr(755, root, root) %{_sbindir}/mysqld-debug %attr(755, root, root) %{_sbindir}/mysqlmanager %attr(755, root, root) %{_sbindir}/rcmysql -%attr(644, root, root) %{_libdir}/mysql/mysqld.sym %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql %attr(755, root, root) %{_sysconfdir}/init.d/mysql @@ -642,7 +584,6 @@ fi %attr(755, root, root) %{_bindir}/msql2mysql %attr(755, root, root) %{_bindir}/mysql %attr(755, root, root) %{_bindir}/mysql_find_rows -%attr(755, root, root) %{_bindir}/mysql_tableinfo %attr(755, root, root) %{_bindir}/mysql_waitpid %attr(755, root, root) %{_bindir}/mysqlaccess %attr(755, root, root) %{_bindir}/mysqladmin @@ -651,6 +592,7 @@ fi %attr(755, root, root) %{_bindir}/mysqldump %attr(755, root, root) %{_bindir}/mysqlimport %attr(755, root, root) %{_bindir}/mysqlshow +%attr(755, root, root) %{_bindir}/mysqlslap %doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql.1* @@ -661,6 +603,7 @@ fi %doc %attr(644, root, man) %{_mandir}/man1/mysqldump.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlimport.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlshow.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlslap.1* %post shared /sbin/ldconfig @@ -689,6 +632,9 @@ fi %attr(755, root, root) %{_bindir}/ndb_config %attr(755, root, root) %{_bindir}/ndb_error_reporter %attr(755, root, root) %{_bindir}/ndb_size.pl +%attr(755, root, root) %{_bindir}/ndb_print_backup_file +%attr(755, root, root) %{_bindir}/ndb_print_schema_file +%attr(755, root, root) %{_bindir}/ndb_print_sys_file %attr(-, root, root) %{_datadir}/mysql/ndb_size.tmpl %files ndb-extra @@ -696,21 +642,18 @@ fi %attr(755, root, root) %{_bindir}/ndb_drop_index %attr(755, root, root) %{_bindir}/ndb_drop_table %attr(755, root, root) %{_bindir}/ndb_delete_all +%attr(755, root, root) %{_sbindir}/ndb_cpcd %files devel %defattr(-, root, root, 0755) -%doc EXCEPTIONS-CLIENT +%doc mysql-release-%{mysql_version}/EXCEPTIONS-CLIENT %doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1* -%attr(755, root, root) %{_bindir}/comp_err %attr(755, root, root) %{_bindir}/mysql_config %dir %attr(755, root, root) %{_includedir}/mysql %dir %attr(755, root, root) %{_libdir}/mysql %{_includedir}/mysql/* %{_libdir}/mysql/libdbug.a %{_libdir}/mysql/libheap.a -%if %{have_libgcc} -%{_libdir}/mysql/libmygcc.a -%endif %{_libdir}/mysql/libmyisam.a %{_libdir}/mysql/libmyisammrg.a %{_libdir}/mysql/libmysqlclient.a @@ -722,34 +665,25 @@ fi %{_libdir}/mysql/libndbclient.a %{_libdir}/mysql/libndbclient.la %{_libdir}/mysql/libvio.a -%if %{STATIC_BUILD} -%else %{_libdir}/mysql/libz.a %{_libdir}/mysql/libz.la -%endif %files shared %defattr(-, root, root, 0755) # Shared libraries (omit for architectures that don't support them) -%{_libdir}/*.so* +%{_libdir}/libmysql*.so* +%{_libdir}/libndb*.so* -%files bench +%files test %defattr(-, root, root, 0755) -%attr(-, root, root) %{_datadir}/sql-bench %attr(-, root, root) %{_datadir}/mysql-test %attr(755, root, root) %{_bindir}/mysql_client_test -%attr(755, root, root) %{_bindir}/mysqltestmanager -%attr(755, root, root) %{_bindir}/mysqltestmanager-pwgen -%attr(755, root, root) %{_bindir}/mysqltestmanagerc +%attr(755, root, root) %{_bindir}/mysql_client_test_embedded +%attr(755, root, root) %{_bindir}/mysqltest_embedded -%files Max -%defattr(-, root, root, 0755) -%attr(755, root, root) %{_sbindir}/mysqld-max -%attr(644, root, root) %{_libdir}/mysql/mysqld-max.sym - -#%files embedded -#%defattr(-, root, root, 0755) -# %attr(644, root, root) %{_libdir}/mysql/libmysqld.a +%files embedded +%defattr(-, root, root, 0755) +%attr(644, root, root) %{_libdir}/mysql/libmysqld.a # The spec file changelog only includes changes made to the spec file # itself - note that they must be ordered by date (important when @@ -771,10 +705,21 @@ fi replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading (bug#22081). -* Wed Nov 15 2006 Joerg Bruehe <joerg@mysql.com> +* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com> + +- Call "make install" using "benchdir_root=%{_datadir}", + because that is affecting the regression test suite as well. + +* Mon Nov 13 2006 Joerg Bruehe <joerg@mysql.com> + +- Add "--with-partition" to all server builds. -- Switch from "make test*" to explicit calls of the test suite, - so that "report features" can be used. +- Use "--report-features" in one test run per server build. + +* Tue Aug 15 2006 Joerg Bruehe <joerg@mysql.com> + +- The "max" server is removed from packages, effective from 5.1.12-beta. + Delete all steps to build, package, or install it. * Mon Jul 10 2006 Joerg Bruehe <joerg@mysql.com> @@ -810,9 +755,9 @@ fi * Wed May 10 2006 Kent Boortz <kent@mysql.com> -- Use character set "all" for the "max", to make Cluster nodes - independent on the character set directory, and the problem that - two RPM sub packages both wants to install this directory. +- Use character set "all" when compiling with Cluster, to make Cluster + nodes independent on the character set directory, and the problem + that two RPM sub packages both wants to install this directory. * Mon May 01 2006 Kent Boortz <kent@mysql.com> @@ -823,25 +768,52 @@ fi - Install and run "mysql_upgrade" +* Wed Apr 12 2006 Jim Winstead <jimw@mysql.com> + +- Remove sql-bench, and MySQL-bench RPM (will be built as an independent + project from the mysql-bench repository) + +* Tue Apr 11 2006 Jim Winstead <jimw@mysql.com> + +- Remove old mysqltestmanager and related programs * Sat Apr 01 2006 Kent Boortz <kent@mysql.com> - Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS -* Fri Mar 03 2006 Kent Boortz <kent@mysql.com> +* Wed Mar 07 2006 Kent Boortz <kent@mysql.com> + +- Changed product name from "Community Edition" to "Community Server" + +* Mon Mar 06 2006 Kent Boortz <kent@mysql.com> + +- Fast mutexes is now disabled by default, but should be + used in Linux builds. + +* Mon Feb 20 2006 Kent Boortz <kent@mysql.com> -- Don't output an embedded package as it is empty -- Can't use bundled zlib when doing static build. Might be a - automake/libtool problem, having two .la files, "libmysqlclient.la" - and "libz.la", on the same command line to link "thread_test" - expands to too many "-lc", "-lpthread" and other libs giving hard - to nail down duplicate symbol defintion problems. +- Reintroduced a max build +- Limited testing of 'debug' and 'max' servers +- Berkeley DB only in 'max' -* Fri Jan 10 2006 Joerg Bruehe <joerg@mysql.com> +* Mon Feb 13 2006 Joerg Bruehe <joerg@mysql.com> - Use "-i" on "make test-force"; this is essential for later evaluation of this log file. -* Fri Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com> +* Thu Feb 09 2006 Kent Boortz <kent@mysql.com> + +- Pass '-static' to libtool, link static with our own libraries, dynamic + with system libraries. Link with the bundled zlib. + +* Wed Feb 08 2006 Kristian Nielsen <knielsen@mysql.com> + +- Modified RPM spec to match new 5.1 debug+max combined community packaging. + +* Sun Dec 18 2005 Kent Boortz <kent@mysql.com> + +- Added "client/mysqlslap" + +* Mon Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com> - Added zlib to the list of (static) libraries installed - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld) @@ -944,6 +916,10 @@ fi - Added a "make clean" between separate calls to "BuildMySQL". +* Thu May 12 2005 Guilhem Bichot <guilhem@mysql.com> + +- Removed the mysql_tableinfo script made obsolete by the information schema + * Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com> - Enabled the "blackhole" storage engine for the Max RPM |