head	1.13;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.5
	OPENPKG_E1_MP:1.5
	OPENPKG_E1_MP_2_STABLE:1.3.2.2
	OPENPKG_E1_FP:1.3.2.2
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3.2.2
	OPENPKG_2_STABLE:1.3.0.2;
locks; strict;
comment	@# @;


1.13
date	2008.11.28.21.10.49;	author rse;	state dead;
branches;
next	1.12;
commitid	dccEKeA1vubSeqst;

1.12
date	2008.09.13.18.54.44;	author rse;	state Exp;
branches;
next	1.11;
commitid	cnm66S9zq7RDVDit;

1.11
date	2008.04.17.06.40.45;	author rse;	state Exp;
branches;
next	1.10;
commitid	oVkdxiXgJdCMEqZs;

1.10
date	2008.02.14.18.19.22;	author rse;	state Exp;
branches;
next	1.9;
commitid	YnFj4tR4PPKZxoRs;

1.9
date	2007.10.01.06.07.56;	author rse;	state Exp;
branches;
next	1.8;
commitid	nE4joL3qubS6SQzs;

1.8
date	2007.05.16.19.44.48;	author rse;	state Exp;
branches;
next	1.7;
commitid	JhAgzlKgGJFmPbis;

1.7
date	2007.04.13.08.01.26;	author rse;	state Exp;
branches;
next	1.6;
commitid	orstxRib4BoPZSds;

1.6
date	2007.02.07.08.07.28;	author rse;	state Exp;
branches;
next	1.5;
commitid	Uac5b1kcXDCr7x5s;

1.5
date	2006.12.12.18.56.13;	author rse;	state Exp;
branches;
next	1.4;
commitid	QZKNQoo9OobBxgYr;

1.4
date	2006.11.03.19.03.45;	author rse;	state Exp;
branches;
next	1.3;
commitid	Sm0Ku7RP4ulUPfTr;

1.3
date	2006.10.11.21.22.22;	author rse;	state Exp;
branches
	1.3.2.1;
next	1.2;
commitid	qNqO1Q1ElItiljQr;

1.2
date	2006.07.05.09.27.22;	author thl;	state Exp;
branches;
next	1.1;
commitid	hd2NQbZooUwjxEDr;

1.1
date	2006.03.11.12.59.12;	author rse;	state Exp;
branches;
next	;
commitid	x3Ja5L11JufarLor;

1.3.2.1
date	2006.10.11.21.22.22;	author rse;	state dead;
branches;
next	1.3.2.2;
commitid	iZxwRSmmWscPXUQr;

1.3.2.2
date	2006.10.16.14.53.06;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.13
log
@remove mysql51 package
@
text
@Index: include/Makefile.in
--- include/Makefile.in.orig	2008-08-28 17:43:15 +0200
+++ include/Makefile.in	2008-09-13 18:34:54 +0200
@@@@ -394,14 +394,14 @@@@
 			decimal.h errmsg.h my_global.h my_net.h \
 			my_getopt.h sslopt-longopts.h my_dir.h \
 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
-			m_ctype.h my_attribute.h $(HEADERS_GEN)
+			m_ctype.h my_attribute.h rijndael.h sha1.h my_aes.h $(HEADERS_GEN)
 
 noinst_HEADERS = config-win.h config-netware.h my_bit.h \
 			heap.h my_bitmap.h my_uctype.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 my_trie.h hash.h thr_alarm.h \
+			my_nosys.h my_alarm.h queues.h \
+			my_tree.h my_trie.h hash.h thr_alarm.h \
 			thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
 			mysql_version.h.in my_handler.h my_time.h \
 			my_vle.h my_user.h my_atomic.h atomic/nolock.h \
Index: mysys/default.c
--- mysys/default.c.orig	2008-08-28 17:40:47 +0200
+++ mysys/default.c	2008-09-13 18:38:09 +0200
@@@@ -1086,8 +1086,7 @@@@
 
 #else
 
-  errors += add_directory(alloc, "/etc/", dirs);
-  errors += add_directory(alloc, "/etc/mysql/", dirs);
+  errors += add_directory(alloc, "@@l_prefix@@/etc/mysql/", dirs);
 
 #if defined(DEFAULT_SYSCONFDIR)
   if (DEFAULT_SYSCONFDIR != "")
Index: scripts/mysql_config.sh
--- scripts/mysql_config.sh.orig	2008-08-28 17:40:52 +0200
+++ scripts/mysql_config.sh	2008-09-13 18:34:54 +0200
@@@@ -104,9 +104,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@@ @@openssl_libs@@ "
 
 if [ -r "$pkglibdir/libmygcc.a" ]; then
Index: scripts/mysql_system_tables_data.sql
--- scripts/mysql_system_tables_data.sql.orig	2008-08-28 17:40:52 +0200
+++ scripts/mysql_system_tables_data.sql	2008-09-13 18:34:54 +0200
@@@@ -11,8 +11,6 @@@@
 -- Fill "db" table with default grants for anyone to
 -- access database 'test' and 'test_%' if "db" table didn't exist
 CREATE TEMPORARY TABLE tmp_db LIKE db;
-INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
-INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
 INSERT INTO db SELECT * FROM tmp_db WHERE @@had_db_table=0;
 DROP TABLE tmp_db;
 
Index: sql/Makefile.in
--- sql/Makefile.in.orig	2008-08-28 17:43:23 +0200
+++ sql/Makefile.in	2008-09-13 18:34:54 +0200
@@@@ -517,7 +517,7 @@@@
 			$(top_builddir)/strings/libmystrings.a
 
 mysqld_DEPENDENCIES = @@mysql_plugin_libs@@ $(SUPPORTING_LIBS) libndb.la
-LDADD = $(SUPPORTING_LIBS) @@ZLIB_LIBS@@ @@NDB_SCI_LIBS@@
+LDADD = $(SUPPORTING_LIBS) @@NDB_SCI_LIBS@@
 mysqld_LDADD = libndb.la \
 			@@MYSQLD_EXTRA_LDFLAGS@@ \
 			@@pstack_libs@@ \
@


1.12
log
@upgrading package: mysql51 5.1.26 -> 5.1.28
@
text
@@


1.11
log
@upgrading package: mysql51 5.1.23 -> 5.1.24
@
text
@d2 2
a3 2
--- include/Makefile.in.orig	2008-04-08 13:24:47 +0200
+++ include/Makefile.in	2008-04-17 08:22:19 +0200
d23 11
a33 9
--- mysys/default.c.orig	2008-04-08 13:23:13 +0200
+++ mysys/default.c	2008-04-17 08:06:57 +0200
@@@@ -1100,12 +1100,11 @@@@
 static void init_default_directories_unix()
 {
   bzero((char *) default_directories, sizeof(default_directories));
-  ADD_DIRECTORY("/etc/");
-  ADD_DIRECTORY("/etc/mysql/");
 #ifdef DEFAULT_SYSCONFDIR
a34 6
     ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
 #endif
+  ADD_DIRECTORY("@@l_prefix@@/etc/mysql/");
   ADD_COMMON_DIRECTORIES();
   ADD_DIRECTORY("~/");
 }
d36 2
a37 2
--- scripts/mysql_config.sh.orig	2008-04-08 13:23:12 +0200
+++ scripts/mysql_config.sh	2008-04-17 08:06:57 +0200
d51 2
a52 2
--- scripts/mysql_system_tables_data.sql.orig	2008-04-08 13:23:10 +0200
+++ scripts/mysql_system_tables_data.sql	2008-04-17 08:06:57 +0200
d63 3
a65 3
--- sql/Makefile.in.orig	2008-04-08 13:24:56 +0200
+++ sql/Makefile.in	2008-04-17 08:06:57 +0200
@@@@ -515,7 +515,7 @@@@
@


1.10
log
@upgrading package: mysql51 5.1.22 -> 5.1.23
@
text
@d2 2
a3 2
--- include/Makefile.in.orig	2008-01-29 22:43:48 +0100
+++ include/Makefile.in	2008-02-14 18:41:56 +0100
d11 1
a11 1
 noinst_HEADERS = config-win.h config-netware.h \
d23 2
a24 2
--- mysys/default.c.orig	2008-01-29 22:41:43 +0100
+++ mysys/default.c	2008-02-14 18:43:30 +0100
d40 3
a42 3
--- scripts/mysql_config.sh.orig	2008-01-29 22:41:33 +0100
+++ scripts/mysql_config.sh	2008-02-14 10:14:10 +0100
@@@@ -102,9 +102,9 @@@@
d53 1
a53 1
 cflags="-I$pkgincludedir @@CFLAGS@@ " #note: end space!
d55 2
a56 2
--- scripts/mysql_system_tables_data.sql.orig	2008-01-29 22:41:27 +0100
+++ scripts/mysql_system_tables_data.sql	2008-02-14 10:14:10 +0100
d67 3
a69 3
--- sql/Makefile.in.orig	2008-01-29 22:43:59 +0100
+++ sql/Makefile.in	2008-02-14 10:14:10 +0100
@@@@ -513,7 +513,7 @@@@
@


1.9
log
@upgrading package: mysql51 5.1.18 -> 5.1.22
@
text
@d2 3
a4 3
--- include/Makefile.in.orig	2007-09-24 12:32:02 +0200
+++ include/Makefile.in	2007-10-01 07:39:56 +0200
@@@@ -395,14 +395,14 @@@@
d8 2
a9 2
-			m_ctype.h mysql/plugin.h my_attribute.h $(HEADERS_GEN)
+			m_ctype.h mysql/plugin.h my_attribute.h rijndael.h sha1.h my_aes.h $(HEADERS_GEN)
a21 27
Index: include/my_global.h
--- include/my_global.h.orig	2007-09-24 12:30:24 +0200
+++ include/my_global.h	2007-10-01 07:39:56 +0200
@@@@ -562,12 +562,6 @@@@
 #define PURIFY_OR_LINT_INIT(var)
 #endif
 
-/* Define some useful general macros */
-#if !defined(max)
-#define max(a, b)	((a) > (b) ? (a) : (b))
-#define min(a, b)	((a) < (b) ? (a) : (b))
-#endif
-
 #if !defined(HAVE_UINT)
 #undef HAVE_UINT
 #define HAVE_UINT
@@@@ -1508,4 +1502,10 @@@@
 /* Length of decimal number represented by INT64. */
 #define MY_INT64_NUM_DECIMAL_DIGITS 21
 
+/* Define some useful general macros */
+#if !defined(max)
+#define max(a, b)	((a) > (b) ? (a) : (b))
+#define min(a, b)	((a) < (b) ? (a) : (b))
+#endif
+
 #endif /* my_global_h */
d23 11
a33 9
--- mysys/default.c.orig	2007-09-24 12:30:12 +0200
+++ mysys/default.c	2007-10-01 07:39:56 +0200
@@@@ -1012,8 +1012,7 @@@@
 #elif defined(__NETWARE__)
   *ptr++= "sys:/etc/";
 #else
-  *ptr++= "/etc/";
-  *ptr++= "/etc/mysql/";
+  *ptr++= "@@l_prefix@@/etc/mysql/";
d35 4
a38 2
   if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
     *ptr++= env;
d40 3
a42 3
--- scripts/mysql_config.sh.orig	2007-09-24 12:29:59 +0200
+++ scripts/mysql_config.sh	2007-10-01 07:39:56 +0200
@@@@ -97,9 +97,9 @@@@
d55 3
a57 3
--- scripts/mysql_system_tables_data.sql.orig	2007-09-24 12:29:43 +0200
+++ scripts/mysql_system_tables_data.sql	2007-10-01 07:39:56 +0200
@@@@ -5,8 +5,6 @@@@
d67 3
a69 3
--- sql/Makefile.in.orig	2007-09-24 12:32:16 +0200
+++ sql/Makefile.in	2007-10-01 07:39:56 +0200
@@@@ -512,7 +512,7 @@@@
@


1.8
log
@upgrading package: mysql51 5.1.17 -> 5.1.18
@
text
@d2 3
a4 3
--- include/Makefile.in.orig	2007-05-08 11:42:16 +0200
+++ include/Makefile.in	2007-05-16 21:28:21 +0200
@@@@ -394,14 +394,14 @@@@
d19 1
a19 1
 			thr_lock.h t_ctype.h violite.h md5.h base64.h \
d22 27
d50 3
a52 3
--- mysys/default.c.orig	2007-05-08 11:41:21 +0200
+++ mysys/default.c	2007-05-16 21:24:29 +0200
@@@@ -1011,8 +1011,7 @@@@
d63 2
a64 2
--- scripts/mysql_config.sh.orig	2007-05-08 11:41:08 +0200
+++ scripts/mysql_config.sh	2007-05-16 21:24:29 +0200
d78 2
a79 2
--- scripts/mysql_system_tables_data.sql.orig	2007-05-08 11:40:59 +0200
+++ scripts/mysql_system_tables_data.sql	2007-05-16 21:29:50 +0200
d90 3
a92 3
--- sql/Makefile.in.orig	2007-05-08 11:42:28 +0200
+++ sql/Makefile.in	2007-05-16 21:24:29 +0200
@@@@ -502,7 +502,7 @@@@
d95 5
a99 4
 mysqld_DEPENDENCIES = @@mysql_plugin_libs@@ $(SUPPORTING_LIBS)
-LDADD = $(SUPPORTING_LIBS) @@ZLIB_LIBS@@
+LDADD = $(SUPPORTING_LIBS)
 mysqld_LDADD = @@MYSQLD_EXTRA_LDFLAGS@@ \
a100 1
 			@@mysql_plugin_libs@@ \
@


1.7
log
@upgrading package: mysql51 5.1.16 -> 5.1.17
@
text
@d2 4
a5 4
--- include/Makefile.in.orig	2007-04-04 15:18:39 +0200
+++ include/Makefile.in	2007-04-13 09:39:03 +0200
@@@@ -396,14 +396,14 @@@@
 			errmsg.h my_global.h my_net.h \
d8 2
a9 2
-			m_ctype.h mysql/plugin.h $(HEADERS_GEN)
+			m_ctype.h mysql/plugin.h rijndael.h sha1.h my_aes.h $(HEADERS_GEN)
d20 1
a20 1
 			mysql_version.h.in my_handler.h my_time.h decimal.h \
a21 14
Index: include/my_global.h
--- include/my_global.h.orig	2007-04-04 15:15:25 +0200
+++ include/my_global.h	2007-04-13 09:39:03 +0200
@@@@ -876,9 +876,8 @@@@
 #define SSIZE_MAX ((~((size_t) 0)) / 2)
 #endif
 
-#if !defined(HAVE_ISINF) && !defined(isinf)
+#undef isinf
 #define isinf(X)    0
-#endif
 
 /* Define missing math constants. */
 #ifndef M_PI
d23 2
a24 2
--- mysys/default.c.orig	2007-04-04 15:13:42 +0200
+++ mysys/default.c	2007-04-13 09:39:03 +0200
d36 2
a37 2
--- scripts/mysql_config.sh.orig	2007-04-04 15:12:23 +0200
+++ scripts/mysql_config.sh	2007-04-13 09:39:03 +0200
d51 10
a60 5
--- scripts/mysql_system_tables_data.sql.orig	2007-04-04 15:10:36 +0200
+++ scripts/mysql_system_tables_data.sql	2007-04-13 09:44:42 +0200
@@@@ -2,10 +2,6 @@@@
 -- The inital data for system tables of MySQL Server
 --
a61 7
--- default grants for anyone to access database 'test' and 'test_%'
-INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
-INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
-
 -- default users allowing root access from local machine
 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','Y','Y','','','','',0,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','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
d63 3
a65 3
--- sql/Makefile.in.orig	2007-04-04 15:18:53 +0200
+++ sql/Makefile.in	2007-04-13 09:39:03 +0200
@@@@ -505,7 +505,7 @@@@
@


1.6
log
@upgrading package: mysql51 5.1.14 -> 5.1.15
@
text
@d2 3
a4 3
--- include/Makefile.in.orig	2007-01-30 09:35:30 +0100
+++ include/Makefile.in	2007-02-07 08:54:33 +0100
@@@@ -393,14 +393,14 @@@@
d23 2
a24 2
--- include/my_global.h.orig	2007-01-30 09:34:31 +0100
+++ include/my_global.h	2007-02-07 08:54:33 +0100
d37 2
a38 2
--- mysys/default.c.orig	2007-01-30 09:34:13 +0100
+++ mysys/default.c	2007-02-07 08:56:38 +0100
d50 2
a51 2
--- scripts/mysql_config.sh.orig	2007-01-30 09:34:12 +0100
+++ scripts/mysql_config.sh	2007-02-07 08:54:33 +0100
d64 14
a77 33
Index: scripts/mysql_create_system_tables.sh
--- scripts/mysql_create_system_tables.sh.orig	2007-01-30 09:34:03 +0100
+++ scripts/mysql_create_system_tables.sh	2007-02-07 08:54:33 +0100
@@@@ -94,9 +94,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','Y','Y');
-  INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');"
 fi
 
 if test ! -f $mdata/host.frm
@@@@ -187,17 +184,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','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','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','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','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','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','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','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','Y','Y','','','','',0,0,0);"
d79 3
a81 3
--- sql/Makefile.in.orig	2007-01-30 09:35:40 +0100
+++ sql/Makefile.in	2007-02-07 08:54:33 +0100
@@@@ -501,7 +501,7 @@@@
@


1.5
log
@upgrading package: mysql51 5.1.12 -> 5.1.14
@
text
@d2 2
a3 2
--- include/Makefile.in.orig	2006-12-06 18:06:46 +0100
+++ include/Makefile.in	2006-12-12 19:30:39 +0100
d23 3
a25 3
--- include/my_global.h.orig	2006-12-06 18:05:38 +0100
+++ include/my_global.h	2006-12-12 18:46:44 +0100
@@@@ -844,9 +844,8 @@@@
d37 3
a39 3
--- mysys/default.c.orig	2006-12-06 18:05:36 +0100
+++ mysys/default.c	2006-12-12 18:46:44 +0100
@@@@ -1011,7 +1011,7 @@@@
d44 1
d50 3
a52 3
--- scripts/mysql_config.sh.orig	2006-12-06 18:05:26 +0100
+++ scripts/mysql_config.sh	2006-12-12 18:46:44 +0100
@@@@ -98,9 +98,9 @@@@
d65 3
a67 3
--- scripts/mysql_create_system_tables.sh.orig	2006-12-06 18:05:24 +0100
+++ scripts/mysql_create_system_tables.sh	2006-12-12 18:46:44 +0100
@@@@ -81,9 +81,6 @@@@
d77 1
a77 1
@@@@ -174,17 +171,13 @@@@
d98 3
a100 3
--- sql/Makefile.in.orig	2006-12-06 18:06:54 +0100
+++ sql/Makefile.in	2006-12-12 19:31:27 +0100
@@@@ -503,7 +503,7 @@@@
@


1.4
log
@upgrading package: mysql51 5.1.11 -> 5.1.12
@
text
@d2 5
a6 5
--- include/Makefile.in.orig	2006-10-26 14:03:01 +0200
+++ include/Makefile.in	2006-11-03 09:00:25 +0100
@@@@ -379,14 +379,14 @@@@
 			errmsg.h my_global.h my_net.h my_alloc.h \
 			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
d8 2
a9 2
-			mysql_time.h mysql/plugin.h $(BUILT_SOURCES)
+			mysql_time.h mysql/plugin.h my_aes.h rijndael.h sha1.h $(BUILT_SOURCES)
d23 2
a24 2
--- include/my_global.h.orig	2006-10-26 14:01:59 +0200
+++ include/my_global.h	2006-11-03 09:00:25 +0100
d37 2
a38 2
--- mysys/default.c.orig	2006-10-26 14:01:57 +0200
+++ mysys/default.c	2006-11-03 09:00:25 +0100
d49 2
a50 2
--- scripts/mysql_config.sh.orig	2006-10-26 14:01:56 +0200
+++ scripts/mysql_config.sh	2006-11-03 09:00:25 +0100
d64 2
a65 2
--- scripts/mysql_create_system_tables.sh.orig	2006-10-26 14:01:50 +0200
+++ scripts/mysql_create_system_tables.sh	2006-11-03 09:00:25 +0100
d97 8
a104 10
--- sql/Makefile.in.orig	2006-10-26 14:03:10 +0200
+++ sql/Makefile.in	2006-11-03 09:02:32 +0100
@@@@ -490,7 +490,7 @@@@
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/regex/libregex.a \
-			$(top_builddir)/strings/libmystrings.a @@ZLIB_LIBS@@
+			$(top_builddir)/strings/libmystrings.a
 
 mysqld_DEPENDENCIES = @@mysql_plugin_libs@@ $(LDADD)
d106 2
@


1.3
log
@add back a patch hunk which was lost some time ago and which is important for maximum portability as the libmysys contains fallback implementations for some less portable functions used in libmysqlclient
@
text
@d2 2
a3 2
--- include/Makefile.in.orig	2006-06-02 20:03:03 +0200
+++ include/Makefile.in	2006-10-11 23:06:15 +0200
d21 1
a21 1
 			my_vle.h my_user.h
d23 4
a26 4
--- include/my_global.h.orig	2006-06-02 20:00:41 +0200
+++ include/my_global.h	2006-10-11 23:06:15 +0200
@@@@ -788,9 +788,8 @@@@
 #define FLT_MAX		((float)3.40282346638528860e+38)
d37 3
a39 3
--- mysys/default.c.orig	2006-06-02 20:00:52 +0200
+++ mysys/default.c	2006-10-11 23:06:15 +0200
@@@@ -1001,7 +1001,7 @@@@
d49 2
a50 2
--- scripts/mysql_config.sh.orig	2006-06-02 20:00:53 +0200
+++ scripts/mysql_config.sh	2006-10-11 23:06:15 +0200
d54 1
a54 1
 # We intentionally add a space to the beginning of lib strings, simplifies replace later
d57 4
a60 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@@"
d64 2
a65 2
--- scripts/mysql_create_system_tables.sh.orig	2006-06-02 20:01:33 +0200
+++ scripts/mysql_create_system_tables.sh	2006-10-11 23:06:15 +0200
d96 12
@


1.3.2.1
log
@file mysql51.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:53:06 +0000
@
text
@d1 95
@


1.3.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 95
Index: include/Makefile.in
--- include/Makefile.in.orig	2006-06-02 20:03:03 +0200
+++ include/Makefile.in	2006-10-11 23:06:15 +0200
@@@@ -379,14 +379,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 mysql/plugin.h $(BUILT_SOURCES)
+			mysql_time.h mysql/plugin.h my_aes.h rijndael.h sha1.h $(BUILT_SOURCES)
 
 noinst_HEADERS = config-win.h config-netware.h \
 			heap.h my_bitmap.h my_uctype.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 my_trie.h hash.h thr_alarm.h \
+			my_nosys.h my_alarm.h queues.h \
+			my_tree.h my_trie.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 \
 			my_vle.h my_user.h
Index: include/my_global.h
--- include/my_global.h.orig	2006-06-02 20:00:41 +0200
+++ include/my_global.h	2006-10-11 23:06:15 +0200
@@@@ -788,9 +788,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	2006-06-02 20:00:52 +0200
+++ mysys/default.c	2006-10-11 23:06:15 +0200
@@@@ -1001,7 +1001,7 @@@@
 #elif defined(__NETWARE__)
   *ptr++= "sys:/etc/";
 #else
-  *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	2006-06-02 20:00:53 +0200
+++ scripts/mysql_config.sh	2006-10-11 23:06:15 +0200
@@@@ -98,9 +98,9 @@@@
 
 # Create options 
 # We intentionally add a space to the beginning 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-06-02 20:01:33 +0200
+++ scripts/mysql_create_system_tables.sh	2006-10-11 23:06:15 +0200
@@@@ -81,9 +81,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','Y','Y');
-  INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');"
 fi
 
 if test ! -f $mdata/host.frm
@@@@ -174,17 +171,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','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','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','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','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','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','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','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','Y','Y','','','','',0,0,0);"
@


1.2
log
@upgrading package: mysql51 5.1.7 -> 5.1.11
@
text
@d3 1
a3 1
+++ include/Makefile.in	2006-07-05 11:12:33 +0200
d23 3
a25 3
--- include/my_global.h.orig	2006-02-27 22:24:47 +0100
+++ include/my_global.h	2006-03-11 13:35:05 +0100
@@@@ -819,9 +819,8 @@@@
d38 1
a38 1
+++ mysys/default.c	2006-07-05 10:45:08 +0200
d48 15
d64 2
a65 2
--- scripts/mysql_create_system_tables.sh.orig	2006-02-27 22:25:28 +0100
+++ scripts/mysql_create_system_tables.sh	2006-03-11 13:40:53 +0100
@


1.1
log
@add a package for MySQL 5.1 (beta)
@
text
@d2 3
a4 3
--- include/Makefile.in.orig	2006-02-27 22:26:47 +0100
+++ include/Makefile.in	2006-03-11 13:38:18 +0100
@@@@ -350,14 +350,14 @@@@
d11 1
a11 1
 noinst_HEADERS = config-win.h config-os2.h config-netware.h \
d37 2
a38 2
--- mysys/default.c.orig	2006-02-27 22:24:56 +0100
+++ mysys/default.c	2006-03-11 13:35:05 +0100
d40 3
a42 3
   if ((env= getenv("ETC")))
     *ptr++= env;
 #endif
a47 17
Index: scripts/mysql_config.sh
--- scripts/mysql_config.sh.orig	2006-02-27 22:24:57 +0100
+++ scripts/mysql_config.sh	2006-03-11 13:35:05 +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"
@