head 1.8; access; symbols OPENPKG_E1_MP_HEAD:1.7 OPENPKG_E1_MP:1.7 OPENPKG_E1_MP_2_STABLE:1.6 OPENPKG_E1_FP:1.6 OPENPKG_2_STABLE_MP:1.6 OPENPKG_2_STABLE_20061018:1.6 OPENPKG_2_STABLE_20060622:1.6 OPENPKG_2_STABLE:1.6.0.2 OPENPKG_2_STABLE_BP:1.6 OPENPKG_1_3_RELEASE:1.1.2.1 OPENPKG_1_3_SOLID:1.1.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.1.2.1 OPENPKG_1_2_RELEASE:1.1 OPENPKG_1_2_SOLID:1.1.0.4 OPENPKG_1_2_SOLID_BP:1.1 OPENPKG_1_STABLE:1.1.0.2 OPENPKG_1_STABLE_BP:1.1; locks; strict; comment @# @; 1.8 date 2007.07.06.10.57.05; author rse; state dead; branches; next 1.7; commitid WH9E3QRJeAFGgHos; 1.7 date 2006.11.27.17.25.28; author rse; state Exp; branches; next 1.6; commitid bgPztmku11smwkWr; 1.6 date 2006.05.05.07.35.15; author rse; state Exp; branches; next 1.5; commitid FlNgOq27ktLpSNvr; 1.5 date 2006.03.11.12.20.10; author rse; state Exp; branches; next 1.4; commitid mP8iY9RJjWCKdLor; 1.4 date 2003.06.09.11.37.54; author rse; state dead; branches; next 1.3; 1.3 date 2003.02.11.10.20.01; author mlelstv; state Exp; branches; next 1.2; 1.2 date 2003.02.05.09.41.27; author mlelstv; state Exp; branches; next 1.1; 1.1 date 2003.01.16.15.02.07; author mlelstv; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2003.07.24.20.53.51; author rse; state dead; branches; next ; desc @@ 1.8 log @finally remove mysql4 package as mysql is now at version 5 already since 2006-03-11 (more than one year) @ text @Index: bdb/mutex/mut_fcntl.c --- bdb/mutex/mut_fcntl.c.orig 2006-11-03 03:15:45 +0100 +++ bdb/mutex/mut_fcntl.c 2006-11-27 18:12:12 +0100 @@@@ -101,7 +101,7 @@@@ /* Acquire an exclusive kernel lock. */ k_lock.l_type = F_WRLCK; - if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock)) + if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock) == -1) return (__os_get_errno()); /* If the resource is still available, it's ours. */ @@@@ -112,7 +112,7 @@@@ /* Release the kernel lock. */ k_lock.l_type = F_UNLCK; - if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock)) + if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock) == -1) return (__os_get_errno()); /* Index: bdb/os/os_open.c --- bdb/os/os_open.c.orig 2006-11-03 03:17:24 +0100 +++ bdb/os/os_open.c 2006-11-27 18:12:12 +0100 @@@@ -93,7 +93,7 @@@@ if (LF_ISSET(DB_OSO_TRUNC)) oflags |= O_TRUNC; -#ifdef HAVE_O_DIRECT +#if defined(HAVE_O_DIRECT) && defined(__FreeBSD__) if (LF_ISSET(DB_OSO_DIRECT)) oflags |= O_DIRECT; #endif Index: include/Makefile.in --- include/Makefile.in.orig 2006-11-03 03:18:30 +0100 +++ include/Makefile.in 2006-11-27 18:12:12 +0100 @@@@ -343,14 +343,14 @@@@ errmsg.h my_global.h my_net.h my_alloc.h \ my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ - sql_state.h mysql_time.h $(BUILT_SOURCES) + sql_state.h mysql_time.h my_aes.h rijndael.h $(BUILT_SOURCES) noinst_HEADERS = config-win.h config-os2.h config-netware.h \ nisam.h heap.h merge.h my_bitmap.h\ myisam.h myisampack.h myisammrg.h ft_global.h\ mysys_err.h my_base.h help_start.h help_end.h \ - my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \ - my_aes.h my_tree.h hash.h thr_alarm.h \ + my_nosys.h my_alarm.h queues.h sha1.h \ + my_tree.h hash.h thr_alarm.h \ thr_lock.h t_ctype.h violite.h md5.h \ mysql_version.h.in my_handler.h my_time.h Index: include/my_global.h --- include/my_global.h.orig 2006-11-03 03:17:10 +0100 +++ include/my_global.h 2006-11-27 18:12:12 +0100 @@@@ -718,9 +718,8 @@@@ #define FLT_MAX ((float)3.40282346638528860e+38) #endif -#if !defined(HAVE_ISINF) && !defined(isinf) +#undef isinf #define isinf(X) 0 -#endif /* Max size that must be added to a so that we know Size to make Index: libmysql/Makefile.in --- libmysql/Makefile.in.orig 2006-11-03 03:18:31 +0100 +++ libmysql/Makefile.in 2006-11-27 18:12:12 +0100 @@@@ -213,6 +213,7 @@@@ DARWIN_MWCC_FALSE = @@DARWIN_MWCC_FALSE@@ DARWIN_MWCC_TRUE = @@DARWIN_MWCC_TRUE@@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ + -DETCDIR="\"$(MYSQLETCdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) @@@@ -427,6 +428,7 @@@@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) @@ZLIB_INCLUDES@@ +MYSQLETCdir = $(sysconfdir) MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir = $(prefix) Index: libmysql_r/Makefile.in --- libmysql_r/Makefile.in.orig 2006-11-03 03:18:32 +0100 +++ libmysql_r/Makefile.in 2006-11-27 18:12:12 +0100 @@@@ -210,6 +210,7 @@@@ DARWIN_MWCC_FALSE = @@DARWIN_MWCC_FALSE@@ DARWIN_MWCC_TRUE = @@DARWIN_MWCC_TRUE@@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ + -DETCDIR="\"$(MYSQLETCdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) @@@@ -425,6 +426,7 @@@@ -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) @@ZLIB_INCLUDES@@ +MYSQLETCdir = $(sysconfdir) MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir = $(prefix) Index: mysys/Makefile.in --- mysys/Makefile.in.orig 2006-11-03 03:18:37 +0100 +++ mysys/Makefile.in 2006-11-27 18:12:12 +0100 @@@@ -194,6 +194,7 @@@@ DARWIN_MWCC_FALSE = @@DARWIN_MWCC_FALSE@@ DARWIN_MWCC_TRUE = @@DARWIN_MWCC_TRUE@@ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \ + -DETCDIR="\"$(MYSQLETCdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ @@@@ -406,6 +407,7 @@@@ vio_dir = @@vio_dir@@ vio_libs = @@vio_libs@@ zlib_dir = @@zlib_dir@@ +MYSQLETCdir = $(sysconfdir) MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir = $(prefix) Index: mysys/default.c --- mysys/default.c.orig 2006-11-03 03:16:23 +0100 +++ mysys/default.c 2006-11-27 18:12:12 +0100 @@@@ -48,7 +48,7 @@@@ #elif defined(__NETWARE__) "sys:/etc/", #else -"/etc/", +ETCDIR, #endif #ifdef DATADIR DATADIR, Index: scripts/mysql_config.sh --- scripts/mysql_config.sh.orig 2006-11-03 03:16:02 +0100 +++ scripts/mysql_config.sh 2006-11-27 18:15:41 +0100 @@@@ -98,9 +98,9 @@@@ # Create options # We intentionally add a space to the beginning and end of lib strings, simplifies replace later -libs=" $ldflags -L$pkglibdir -lmysqlclient @@ZLIB_DEPS@@ @@NON_THREADED_LIBS@@" +libs=" $ldflags -L$pkglibdir -lmysqlclient -lmysys @@ZLIB_DEPS@@ @@NON_THREADED_LIBS@@" libs="$libs @@openssl_libs@@ @@STATIC_NSS_FLAGS@@ " -libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @@ZLIB_DEPS@@ @@LIBS@@ @@openssl_libs@@ " +libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r -lmysys @@ZLIB_DEPS@@ @@LIBS@@ @@openssl_libs@@ " embedded_libs=" $ldflags -L$pkglibdir -lmysqld @@ZLIB_DEPS@@ @@LIBS@@ @@WRAPLIBS@@ @@innodb_system_libs@@ " cflags="-I$pkgincludedir @@CFLAGS@@ " #note: end space! Index: scripts/mysql_create_system_tables.sh --- scripts/mysql_create_system_tables.sh.orig 2006-11-03 03:15:41 +0100 +++ scripts/mysql_create_system_tables.sh 2006-11-27 18:12:12 +0100 @@@@ -71,9 +71,6 @@@@ c_d="$c_d ) engine=MyISAM" c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin" c_d="$c_d comment='Database privileges';" - - i_d="INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y'); - INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');" fi if test ! -f $mdata/host.frm @@@@ -150,17 +147,13 @@@@ then i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); - REPLACE INTO 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','','','','',0,0,0); - INSERT INTO user (host,user) values ('localhost',''); - INSERT INTO user (host,user) values ('$hostname','');" + REPLACE INTO 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','','','','',0,0,0);" else i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);" if test "$windows" = "0" then i_u="$i_u - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); - INSERT INTO user (host,user) values ('$hostname',''); - INSERT INTO user (host,user) values ('localhost','');" + INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);" else i_u="$i_u INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);" Index: scripts/mysqld_safe.sh --- scripts/mysqld_safe.sh.orig 2006-11-03 03:15:43 +0100 +++ scripts/mysqld_safe.sh 2006-11-27 18:12:12 +0100 @@@@ -150,7 +150,7 @@@@ # Next try where the source installs put it elif test -d $MY_BASEDIR_VERSION/var/mysql then - DATADIR=$MY_BASEDIR_VERSION/var + DATADIR=$MY_BASEDIR_VERSION/var/mysql # Or just give up and use our compiled-in default else DATADIR=@@localstatedir@@ @ 1.7 log @upgrading package: mysql4 4.1.21 -> 4.1.22 @ text @@ 1.6 log @upgrading package: mysql4 4.1.18 -> 4.1.19 @ text @d2 2 a3 2 --- bdb/mutex/mut_fcntl.c.orig 2006-04-29 07:35:50 +0200 +++ bdb/mutex/mut_fcntl.c 2006-05-05 09:12:56 +0200 d23 2 a24 2 --- bdb/os/os_open.c.orig 2006-04-29 07:35:50 +0200 +++ bdb/os/os_open.c 2006-05-05 09:12:56 +0200 d35 3 a37 3 --- include/Makefile.in.orig 2006-04-29 07:36:28 +0200 +++ include/Makefile.in 2006-05-05 09:12:56 +0200 @@@@ -342,14 +342,14 @@@@ d56 3 a58 3 --- include/my_global.h.orig 2006-04-29 07:35:47 +0200 +++ include/my_global.h 2006-05-05 09:12:56 +0200 @@@@ -680,9 +680,8 @@@@ d70 2 a71 2 --- libmysql/Makefile.in.orig 2006-04-29 07:36:29 +0200 +++ libmysql/Makefile.in 2006-05-05 09:12:56 +0200 d80 1 a80 1 @@@@ -426,6 +427,7 @@@@ d89 2 a90 2 --- libmysql_r/Makefile.in.orig 2006-04-29 07:36:30 +0200 +++ libmysql_r/Makefile.in 2006-05-05 09:12:56 +0200 d99 1 a99 1 @@@@ -424,6 +425,7 @@@@ d108 2 a109 2 --- mysys/Makefile.in.orig 2006-04-29 07:36:33 +0200 +++ mysys/Makefile.in 2006-05-05 09:12:56 +0200 d118 1 a118 1 @@@@ -405,6 +406,7 @@@@ d127 2 a128 2 --- mysys/default.c.orig 2006-04-29 07:35:48 +0200 +++ mysys/default.c 2006-05-05 09:12:56 +0200 d139 2 a140 2 --- scripts/mysql_config.sh.orig 2006-04-29 07:35:49 +0200 +++ scripts/mysql_config.sh 2006-05-05 09:17:27 +0200 d144 1 a144 1 # We intentionally add a space to the beginning of lib strings, simplifies replace later d147 4 a150 4 libs="$libs @@openssl_libs@@ @@STATIC_NSS_FLAGS@@" -libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @@ZLIB_DEPS@@ @@LIBS@@ @@openssl_libs@@" +libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r -lmysys @@ZLIB_DEPS@@ @@LIBS@@ @@openssl_libs@@" embedded_libs=" $ldflags -L$pkglibdir -lmysqld @@ZLIB_DEPS@@ @@LIBS@@ @@WRAPLIBS@@ @@innodb_system_libs@@" d154 2 a155 2 --- scripts/mysql_create_system_tables.sh.orig 2006-04-29 07:35:51 +0200 +++ scripts/mysql_create_system_tables.sh 2006-05-05 09:12:56 +0200 d187 2 a188 2 --- scripts/mysqld_safe.sh.orig 2006-04-29 07:35:53 +0200 +++ scripts/mysqld_safe.sh 2006-05-05 09:12:56 +0200 @ 1.5 log @upgrade MySQL (package 'mysql') from 4.1 to 5.0. MySQL 4.1 is still available as package 'mysql4' for backward compatibility reasons. @ text @d1 33 d35 3 a37 3 --- include/Makefile.in.orig 2005-10-10 00:47:19 +0200 +++ include/Makefile.in 2005-11-07 18:12:04 +0100 @@@@ -330,14 +330,14 @@@@ d56 2 a57 2 --- include/my_global.h.orig 2005-10-10 00:46:23 +0200 +++ include/my_global.h 2005-11-07 18:12:04 +0100 d69 29 a97 4 Index: scripts/mysql_config.sh --- scripts/mysql_config.sh.orig 2005-10-10 00:46:25 +0200 +++ scripts/mysql_config.sh 2005-11-07 18:12:04 +0100 @@@@ -93,11 +93,11 @@@@ d99 3 a101 1 # Create options d103 44 a146 2 -libs="$ldflags -L$pkglibdir -lmysqlclient @@ZLIB_DEPS@@ @@NON_THREADED_LIBS@@" +libs="$ldflags -L$pkglibdir -lmysqlclient -lmysys @@ZLIB_DEPS@@ @@NON_THREADED_LIBS@@" d148 3 a150 1 libs=`echo "$libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'` a151 3 -libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @@ZLIB_DEPS@@ @@LIBS@@ @@openssl_libs@@" +libs_r="$ldflags -L$pkglibdir -lmysqlclient_r -lmysys @@ZLIB_DEPS@@ @@LIBS@@ @@openssl_libs@@" libs_r=`echo "$libs_r" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'` a152 1 include="-I$pkgincludedir" d154 2 a155 2 --- scripts/mysql_create_system_tables.sh.orig 2005-10-10 00:46:35 +0200 +++ scripts/mysql_create_system_tables.sh 2005-11-07 18:12:04 +0100 d187 3 a189 3 --- scripts/mysqld_safe.sh.orig 2005-10-10 00:46:44 +0200 +++ scripts/mysqld_safe.sh 2005-11-07 18:12:04 +0100 @@@@ -121,7 +121,7 @@@@ a197 102 Index: mysys/Makefile.in --- mysys/Makefile.in.orig 2005-10-10 00:47:23 +0200 +++ mysys/Makefile.in 2005-11-10 11:50:57 +0100 @@@@ -247,6 +247,7 @@@@ DARWIN_MWCC_FALSE = @@DARWIN_MWCC_FALSE@@ DARWIN_MWCC_TRUE = @@DARWIN_MWCC_TRUE@@ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \ + -DETCDIR="\"$(MYSQLETCdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ @@@@ -452,6 +453,7 @@@@ vio_dir = @@vio_dir@@ vio_libs = @@vio_libs@@ zlib_dir = @@zlib_dir@@ +MYSQLETCdir = $(sysconfdir) MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir = $(prefix) Index: mysys/default.c --- mysys/default.c.orig 2005-11-10 10:26:30 +0100 +++ mysys/default.c 2005-11-10 11:53:32 +0100 @@@@ -48,7 +48,7 @@@@ #elif defined(__NETWARE__) "sys:/etc/", #else -"/etc/", +ETCDIR, #endif #ifdef DATADIR DATADIR, Index: libmysql/Makefile.in --- libmysql/Makefile.in.orig 2005-10-10 00:47:20 +0200 +++ libmysql/Makefile.in 2005-11-10 12:13:57 +0100 @@@@ -213,6 +213,7 @@@@ DARWIN_MWCC_FALSE = @@DARWIN_MWCC_FALSE@@ DARWIN_MWCC_TRUE = @@DARWIN_MWCC_TRUE@@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ + -DETCDIR="\"$(MYSQLETCdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) @@@@ -420,6 +421,7 @@@@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) @@ZLIB_INCLUDES@@ +MYSQLETCdir = $(sysconfdir) MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir = $(prefix) Index: libmysql_r/Makefile.in --- libmysql_r/Makefile.in.orig 2005-10-10 00:47:20 +0200 +++ libmysql_r/Makefile.in 2005-11-10 12:14:34 +0100 @@@@ -211,6 +211,7 @@@@ DARWIN_MWCC_FALSE = @@DARWIN_MWCC_FALSE@@ DARWIN_MWCC_TRUE = @@DARWIN_MWCC_TRUE@@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ + -DETCDIR="\"$(MYSQLETCdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) @@@@ -419,6 +420,7 @@@@ -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) @@ZLIB_INCLUDES@@ +MYSQLETCdir = $(sysconfdir) MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir = $(prefix) Index: bdb/mutex/mut_fcntl.c --- bdb/mutex/mut_fcntl.c.orig 2005-10-10 00:46:27 +0200 +++ bdb/mutex/mut_fcntl.c 2005-11-11 13:44:07 +0100 @@@@ -101,7 +101,7 @@@@ /* Acquire an exclusive kernel lock. */ k_lock.l_type = F_WRLCK; - if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock)) + if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock) == -1) return (__os_get_errno()); /* If the resource is still available, it's ours. */ @@@@ -112,7 +112,7 @@@@ /* Release the kernel lock. */ k_lock.l_type = F_UNLCK; - if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock)) + if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock) == -1) return (__os_get_errno()); /* Index: bdb/os/os_open.c --- bdb/os/os_open.c.orig 2005-10-10 00:46:27 +0200 +++ bdb/os/os_open.c 2005-11-11 13:44:07 +0100 @@@@ -93,7 +93,7 @@@@ if (LF_ISSET(DB_OSO_TRUNC)) oflags |= O_TRUNC; -#ifdef HAVE_O_DIRECT +#if defined(HAVE_O_DIRECT) && defined(__FreeBSD__) if (LF_ISSET(DB_OSO_DIRECT)) oflags |= O_DIRECT; #endif @ 1.4 log @Following our general rules for dealing with versioned packages (and the fact that we only want _one_ single version in each release, of course), the old (MySQL-3 based) "mysql" package was first merged up to 1-STABLE (for possible inclusion into OpenPKG 1.3), then "mysql" was renamed to "mysql3" (in case you still have to drive MySQL 3 within OpenPKG-CURRENT), "mysql4" become "mysql" and "mysql4" has gone. @ text @d1 46 a46 12 --- scripts/mysql_install_db.sh.dist Wed Jan 29 12:29:21 2003 +++ scripts/mysql_install_db.sh Wed Feb 5 09:56:12 2003 @@@@ -138,9 +138,8 @@@@ then if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi if test ! -d $ldata/mysql; then mkdir $ldata/mysql; chmod 700 $ldata/mysql ; fi - if test ! -d $ldata/test; then mkdir $ldata/test; chmod 700 $ldata/test ; fi if test -w / -a ! -z "$user"; then - chown $user $ldata $ldata/mysql $ldata/test; + chown $user $ldata $ldata/mysql fi fi d48 11 a58 2 @@@@ -178,8 +177,6 @@@@ c_d="$c_d )" d60 1 a60 1 d66 1 a66 14 @@@@ -250,10 +247,7 @@@@ INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); - REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); - - INSERT INTO user (host,user) values ('localhost',''); - INSERT INTO user (host,user) values ('$hostname','');" + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);" fi if test ! -f $mdata/func.frm @@@@ -351,10 +345,7 @@@@ if test "$IN_RPM" -eq 0 d68 53 a120 20 echo "You can start the MySQL daemon with:" - echo "cd @@prefix@@ ; $bindir/mysqld_safe &" - echo - echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:" - echo "cd sql-bench ; perl run-all-tests" + echo "@@l_prefix@@/etc/rc mysql4 start" echo fi echo "Please report any problems with the @@scriptdir@@/mysqlbug script!" --- scripts/msql2mysql.sh.dist Tue Feb 11 09:50:29 2003 +++ scripts/msql2mysql.sh Tue Feb 11 09:53:08 2003 @@@@ -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 -- $* +@@libexecdir@@/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 -- $* --- mysys/default.c.dist Wed Jan 29 12:29:20 2003 +++ mysys/default.c Wed Feb 5 09:58:40 2003 @@@@ -49,7 +49,7 @@@@ d125 1 a125 1 +"@@l_prefix@@/etc/mysql4/", d129 71 @ 1.3 log @move replace-utility out of the way, move mysqld into package-private libexecdir @ text @@ 1.2 log @bounce release, use patch made against current sources @ text @d47 8 @ 1.1 log @Made package @ text @d1 2 a2 2 --- scripts/mysql_install_db.sh.dist Thu Jan 16 13:44:25 2003 +++ scripts/mysql_install_db.sh Thu Jan 16 13:59:19 2003 d47 5 a51 5 --- mysys/default.c.dist Thu Jan 16 13:43:20 2003 +++ mysys/default.c Thu Jan 16 13:57:57 2003 @@@@ -47,7 +47,7 @@@@ #ifdef __WIN__ "C:/", @ 1.1.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [removed packages only] @ text @@