head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2009.08.24.16.25.31;	author rse;	state dead;
branches;
next	1.1;
commitid	TeonRWCghnlU0Y0u;

1.1
date	2008.11.28.21.11.57;	author rse;	state Exp;
branches;
next	;
commitid	yYRbUMbZupXffqst;


desc
@@


1.2
log
@remove MySQL 5.0.x
@
text
@Index: mysys/default.c
--- mysys/default.c.orig	2008-08-04 14:19:45 +0200
+++ mysys/default.c	2008-08-09 15:16:21 +0200
@@@@ -1077,7 +1077,7 @@@@
 
 #else
 
-  errors += add_directory(alloc, "/etc/", dirs);
+  errors += add_directory(alloc, "@@l_prefix@@/etc/mysql/", dirs);
 
 #if defined(__EMX__) || defined(OS2)
   if ((env= getenv("ETC")))
Index: scripts/mysql_config.sh
--- scripts/mysql_config.sh.orig	2008-08-04 14:20:01 +0200
+++ scripts/mysql_config.sh	2008-08-09 11:38:36 +0200
@@@@ -102,9 +102,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-04 14:20:02 +0200
+++ scripts/mysql_system_tables_data.sql	2008-08-09 11:38:36 +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');
-INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
 INSERT INTO db SELECT * FROM tmp_db WHERE @@had_db_table=0;
 DROP TABLE tmp_db;
 
@


1.1
log
@make MySQL 5.0 still available
@
text
@@