diff options
author | xtraeme <xtraeme> | 2005-01-17 14:42:35 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2005-01-17 14:42:35 +0000 |
commit | 371167e0f9193397f125085ca5624818edca9352 (patch) | |
tree | 0da4a97133219ba9bc053832cff8452e4ead9e32 /databases/mysql4-server | |
parent | 216cb8aa46e2a03e2f52892ae99c8d815115ea94 (diff) | |
download | pkgsrc-371167e0f9193397f125085ca5624818edca9352.tar.gz |
Update mysql4-{client,server} to 4.1.9.
Functionality added or changed:
* The Mac OS X 10.3 installation disk images now include a MySQL
Preference Pane for the Mac OS X Control Panel that enables the user
to start and stop the MySQL server via the GUI and activate and
deactivate the automatic MySQL server startup on bootup.
* Seconds_Behind_Master will be NULL (which means ``unknown'')
if the slave SQL thread is not running, or if the slave I/O thread
is not running or not connected to master. It will be zero if the
SQL thread has caught up with the I/O thread. It no longer grows
indefinitely if the master is idle.
* InnoDB: Do not acquire an internal InnoDB table lock in LOCK
TABLES if AUTOCOMMIT=1. This helps in porting old MyISAM applications
to InnoDB. InnoDB table locks in that case caused deadlocks very easily.
* InnoDB: Print a more descriptive error and refuse to start InnoDB
if the size of `ibdata' files is smaller than what is stored in the
tablespace header; innodb_force_recovery overrides this.
* The MySQL server aborts immediately instead of simply issuing a
warning if it is started with the --log-bin option but cannot
initialize the binary log at startup (that is, an error occurs when
writing to the binary log file or binary log index file).
* The binary log file and binary log index file now behave like
MyISAM when there is a "disk full" or "quota exceeded" error. See
section A.4.3 How MySQL Handles a Full Disk.
Many bugfixes were fixed... see
http://dev.mysql.com/doc/mysql/en/News-4.1.9.html
Diffstat (limited to 'databases/mysql4-server')
-rw-r--r-- | databases/mysql4-server/PLIST | 7 | ||||
-rw-r--r-- | databases/mysql4-server/distinfo | 11 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-aa | 10 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-am | 10 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-av | 24 |
5 files changed, 19 insertions, 43 deletions
diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST index c8fcbce5d9a..2727a1d0553 100644 --- a/databases/mysql4-server/PLIST +++ b/databases/mysql4-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2005/01/10 15:47:18 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.8 2005/01/17 14:42:35 xtraeme Exp $ bin/client_test bin/comp_err bin/isamchk @@ -68,6 +68,11 @@ share/mysql-test/include/ps_renew.inc share/mysql-test/include/system_db_struct.inc share/mysql-test/install_test_db share/mysql-test/mysql-test-run +share/mysql-test/r/rpl_insert_ignore.result +share/mysql-test/r/rpl_many_optimize.result +share/mysql-test/t/rpl_insert_ignore-slave.opt +share/mysql-test/t/rpl_insert_ignore.test +share/mysql-test/t/rpl_many_optimize.test share/mysql-test/r/alias.result share/mysql-test/r/alter_table.result share/mysql-test/r/analyse.result diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo index 7cfa94f6d44..dff1ec71ff0 100644 --- a/databases/mysql4-server/distinfo +++ b/databases/mysql4-server/distinfo @@ -1,18 +1,17 @@ -$NetBSD: distinfo,v 1.11 2005/01/10 15:47:18 xtraeme Exp $ +$NetBSD: distinfo,v 1.12 2005/01/17 14:42:35 xtraeme Exp $ -SHA1 (mysql-4.1.8a.tar.gz) = 845555eb6d1f48806e24e66a7a28ae822729cdcf -Size (mysql-4.1.8a.tar.gz) = 22945198 bytes -SHA1 (patch-aa) = cb11b0461c88d3ded9be63f8fcf28c0759441a72 +SHA1 (mysql-4.1.9.tar.gz) = e526f301704f8fca7c7e9f42d368ffa1fef2a152 +Size (mysql-4.1.9.tar.gz) = 22308321 bytes +SHA1 (patch-aa) = 1fd6136e4b8212cce4d68bb33c9dcddeca2e3d59 SHA1 (patch-ab) = 8521d07034428de396ed56529b6c18af50739b9d SHA1 (patch-ac) = ba78b6168d79520cc6bee8e06e89ca3fe90d92a1 SHA1 (patch-af) = 2accaca59821f0e82944690f41f905f6560bd76f SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96 -SHA1 (patch-am) = 2279653e5ee3df2f19242e9d4212d3666188b1d2 +SHA1 (patch-am) = 8da1f42e0524512cdba953833420650922a27ccb SHA1 (patch-aq) = b971690206b416e75046cca3e53f6222b55725c5 SHA1 (patch-ar) = bb3329100655d99484934e69d5c8a7e3dc459542 SHA1 (patch-as) = 2cf503e557eb6a8534221f6e576f055b9f4b68ce SHA1 (patch-at) = b8a4ad4d4ff8cf04b300c147a68847d1476e607e SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91 -SHA1 (patch-av) = 6ea5b9338d223f1380386288c537f55d4fd7a7d7 SHA1 (patch-aw) = 79b9afbcb16a868c193cded23a50e53987579f27 SHA1 (patch-ax) = b2f76b2d4e6aca649f975eba0f9c18316d4d4c17 diff --git a/databases/mysql4-server/patches/patch-aa b/databases/mysql4-server/patches/patch-aa index 6910bb9d064..d664846b629 100644 --- a/databases/mysql4-server/patches/patch-aa +++ b/databases/mysql4-server/patches/patch-aa @@ -1,15 +1,13 @@ -$NetBSD: patch-aa,v 1.6 2005/01/10 15:47:18 xtraeme Exp $ - ---- Makefile.in.orig 2005-01-10 16:09:00.000000000 +0100 -+++ Makefile.in 2005-01-10 16:09:25.000000000 +0100 -@@ -338,12 +338,8 @@ +--- Makefile.in.orig 2005-01-17 15:15:42.000000000 +0100 ++++ Makefile.in 2005-01-17 15:16:11.000000000 +0100 +@@ -339,12 +339,8 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack \ -- @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ +- @sql_union_dirs@ scripts man tests \ - netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ tests \ diff --git a/databases/mysql4-server/patches/patch-am b/databases/mysql4-server/patches/patch-am index fc15848592f..87b8b1fbcdd 100644 --- a/databases/mysql4-server/patches/patch-am +++ b/databases/mysql4-server/patches/patch-am @@ -1,7 +1,5 @@ -$NetBSD: patch-am,v 1.5 2004/10/28 01:12:44 xtraeme Exp $ - ---- scripts/mysqld_safe.sh.orig 2004-10-27 23:23:41.000000000 +0200 -+++ scripts/mysqld_safe.sh 2004-10-27 23:27:02.000000000 +0200 +--- scripts/mysqld_safe.sh.orig 2005-01-17 15:16:35.000000000 +0100 ++++ scripts/mysqld_safe.sh 2005-01-17 15:20:03.000000000 +0100 @@ -253,6 +253,14 @@ fi fi @@ -23,7 +21,7 @@ $NetBSD: patch-am,v 1.5 2004/10/28 01:12:44 xtraeme Exp $ then # The pid contains a mysqld process - echo "A mysqld process already exists" - echo "A mysqld process already exists at " `date` >> $err_log -+ datemsg "A mysqld process already exists" ++ datemsg "A mysqld process already exists" exit 1 fi fi @@ -74,7 +72,7 @@ $NetBSD: patch-am,v 1.5 2004/10/28 01:12:44 xtraeme Exp $ @@ -324,7 +330,7 @@ # kill -9 is used or the process won't react on the kill. - numofproces=`ps xa | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"` + numofproces=`ps xaww | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"` - echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log + datemsg -e "\nNumber of processes running now: $numofproces" diff --git a/databases/mysql4-server/patches/patch-av b/databases/mysql4-server/patches/patch-av deleted file mode 100644 index 92e0ee6e32e..00000000000 --- a/databases/mysql4-server/patches/patch-av +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-av,v 1.1 2004/02/24 14:53:54 grant Exp $ - ---- sql/mysqld.cc.orig 2003-12-15 08:23:47.000000000 +1100 -+++ sql/mysqld.cc -@@ -106,7 +106,18 @@ extern "C" { // Because of SCO 3.2V4 - int allow_severity = LOG_INFO; - int deny_severity = LOG_WARNING; - --#ifdef __STDC__ -+#ifdef __FreeBSD__ -+# include <osreldate.h> -+# if defined(__STDC__) && __FreeBSD_version < 500000 -+# define my_fromhost(A) fromhost(A) -+# define my_hosts_access(A) hosts_access(A) -+# define my_eval_client(A) eval_client(A) -+# else -+# define my_fromhost(A) fromhost() -+# define my_hosts_access(A) hosts_access() -+# define my_eval_client(A) eval_client() -+# endif -+#elif defined(__STDC__) - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) |