head	1.6;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.6
	OPENPKG_E1_MP:1.6;
locks; strict;
comment	@# @;


1.6
date	2006.03.11.12.21.38;	author rse;	state dead;
branches;
next	1.5;
commitid	FQAYAdtZKmrheLor;

1.5
date	2005.11.21.20.52.45;	author rse;	state Exp;
branches;
next	1.4;
commitid	a216fVhP8yPPAFar;

1.4
date	2005.10.11.07.09.50;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2005.06.13.17.53.07;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2005.04.23.18.05.38;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2005.03.30.11.28.10;	author rse;	state Exp;
branches;
next	;


desc
@@


1.6
log
@remove obsolete package
@
text
@Index: include/Makefile.in
--- include/Makefile.in.orig	2005-11-15 01:14:00 +0100
+++ include/Makefile.in	2005-11-21 21:19:28 +0100
@@@@ -349,14 +349,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 \
-			mysql_time.h $(BUILT_SOURCES)
+  			mysql_time.h my_aes.h rijndael.h $(BUILT_SOURCES)
 
 noinst_HEADERS = config-win.h config-os2.h config-netware.h \
 			heap.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 \
+ 			my_tree.h hash.h thr_alarm.h \
 			thr_lock.h t_ctype.h violite.h md5.h base64.h \
 			mysql_version.h.in my_handler.h my_time.h decimal.h
 
Index: include/my_global.h
--- include/my_global.h.orig	2005-11-15 01:12:30 +0100
+++ include/my_global.h	2005-11-21 21:18:29 +0100
@@@@ -721,9 +721,8 @@@@
 #define FLT_MAX		((float)3.40282346638528860e+38)
 #endif
 
-#if !defined(HAVE_ISINF) && !defined(isinf)
+#undef isinf
 #define isinf(X)    0
-#endif
 
 /* Define missing math constants. */
 #ifndef M_PI
Index: mysys/default.c
--- mysys/default.c.orig	2005-11-15 01:12:32 +0100
+++ mysys/default.c	2005-11-21 21:18:29 +0100
@@@@ -1001,7 +1001,7 @@@@
   if ((env= getenv("ETC")))
     *ptr++= env;
 #endif
-  *ptr++= "/etc/";
+  *ptr++= "@@l_prefix@@/etc/mysql/";
 #endif
   if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
     *ptr++= env;
Index: scripts/mysql_config.sh
--- scripts/mysql_config.sh.orig	2005-11-15 01:12:33 +0100
+++ scripts/mysql_config.sh	2005-11-21 21:18:29 +0100
@@@@ -93,11 +93,11 @@@@
 
 # Create options
 
-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=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
 
-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; *\$;;'`
 cflags="-I$pkgincludedir @@CFLAGS@@ " #note: end space!
 include="-I$pkgincludedir"
Index: scripts/mysql_create_system_tables.sh
--- scripts/mysql_create_system_tables.sh.orig	2005-11-15 01:12:45 +0100
+++ scripts/mysql_create_system_tables.sh	2005-11-21 21:18:29 +0100
@@@@ -77,9 +77,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','Y','Y','Y','N','N');
-  INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');"
 fi
 
 if test ! -f $mdata/host.frm
@@@@ -167,17 +164,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','Y','Y','Y','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','','','','',0,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','Y','','','','',0,0,0);"
@


1.5
log
@upgrading package: mysql5 5.0.15 -> 5.0.16
@
text
@@


1.4
log
@sync with mysql package
@
text
@d2 3
a4 3
--- include/Makefile.in.orig	2005-05-26 15:27:57 +0200
+++ include/Makefile.in	2005-06-13 19:40:38 +0200
@@@@ -341,14 +341,14 @@@@
d9 1
a9 1
+ 			mysql_time.h my_aes.h rijndael.h $(BUILT_SOURCES)
d17 3
a19 3
+			my_nosys.h my_alarm.h queues.h \
+			my_tree.h hash.h thr_alarm.h \
 			thr_lock.h t_ctype.h violite.h md5.h \
d22 14
d37 3
a39 3
--- mysys/default.c.orig	2005-05-26 15:26:56 +0200
+++ mysys/default.c	2005-06-13 19:41:19 +0200
@@@@ -866,7 +866,7 @@@@
a47 14
Index: include/my_global.h
--- include/my_global.h.orig	2005-08-17 19:06:28.000000000 +0200
+++ include/my_global.h	2005-10-07 22:58:45.677758340 +0200
@@@@ -676,9 +676,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
d49 3
a51 3
--- scripts/mysql_config.sh.orig	2005-05-26 15:26:57 +0200
+++ scripts/mysql_config.sh	2005-06-13 19:40:38 +0200
@@@@ -85,11 +85,11 @@@@
d66 2
a67 2
--- scripts/mysql_create_system_tables.sh.orig	2005-05-26 15:26:59 +0200
+++ scripts/mysql_create_system_tables.sh	2005-06-13 19:40:38 +0200
@


1.3
log
@upgrading package: mysql5 5.0.4 -> 5.0.6
@
text
@d34 14
@


1.2
log
@upgrading package: mysql5 5.0.3 -> 5.0.4
@
text
@d2 3
a4 3
--- include/Makefile.in.orig	2005-04-16 21:02:22 +0200
+++ include/Makefile.in	2005-04-23 19:54:51 +0200
@@@@ -337,14 +337,14 @@@@
d23 6
a28 6
--- mysys/default.c.orig	2005-04-16 21:01:45 +0200
+++ mysys/default.c	2005-04-23 19:53:58 +0200
@@@@ -806,7 +806,7 @@@@
 #elif defined(__NETWARE__)
   *ptr++= "sys:/etc/";
 #else
d35 2
a36 2
--- scripts/mysql_config.sh.orig	2005-04-16 21:01:45 +0200
+++ scripts/mysql_config.sh	2005-04-23 19:53:58 +0200
d52 2
a53 2
--- scripts/mysql_create_system_tables.sh.orig	2005-04-16 21:01:48 +0200
+++ scripts/mysql_create_system_tables.sh	2005-04-23 19:53:58 +0200
d64 1
a64 1
@@@@ -164,17 +161,13 @@@@
@


1.1
log
@new package: mysql5 5.0.3 (Fast Relational Database Management System)
@
text
@d2 3
a4 3
--- include/Makefile.in.orig	2005-03-22 20:27:14 +0100
+++ include/Makefile.in	2005-03-30 13:05:51 +0200
@@@@ -344,14 +344,14 @@@@
d9 1
a9 1
+			mysql_time.h my_aes.h rijndael.h $(BUILT_SOURCES)
d12 1
a12 1
 			nisam.h heap.h merge.h my_bitmap.h\
d17 1
a17 1
+			my_nosys.h my_alarm.h queues.h sha1.h \
d23 3
a25 3
--- mysys/default.c.orig	2005-03-22 20:26:24 +0100
+++ mysys/default.c	2005-03-30 11:08:47 +0200
@@@@ -702,7 +702,7 @@@@
d35 2
a36 2
--- scripts/mysql_config.sh.orig	2005-03-22 20:26:24 +0100
+++ scripts/mysql_config.sh	2005-03-30 11:03:17 +0200
d52 2
a53 2
--- scripts/mysql_create_system_tables.sh.orig	2005-03-22 20:26:34 +0100
+++ scripts/mysql_create_system_tables.sh	2005-03-30 13:10:09 +0200
@