head 1.4; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_2_4_RELEASE:1.3 OPENPKG_2_4_SOLID:1.3.0.2 OPENPKG_2_4_SOLID_BP:1.3 OPENPKG_CW_FP:1.2 OPENPKG_2_3_RELEASE:1.2 OPENPKG_2_3_SOLID:1.2.0.2 OPENPKG_2_3_SOLID_BP:1.2; locks; strict; comment @# @; 1.4 date 2005.06.22.17.03.33; author rse; state dead; branches; next 1.3; 1.3 date 2005.04.08.16.56.05; author rse; state Exp; branches; next 1.2; 1.2 date 2005.01.13.12.31.04; author ms; state Exp; branches; next 1.1; 1.1 date 2004.12.17.09.13.30; author rse; state Exp; branches; next ; desc @@ 1.4 log @MySQL 4.0 was still included as a PLUS package in OpenPKG 2.4 and is obsoleted by the BASE package of MySQL 4.1, so finally remove this package at all. If someone really needs a MySQL 4.0 package they still can get it from CVS, of course. @ text @Index: config.h.in --- config.h.in.orig 2005-03-05 01:38:28 +0100 +++ config.h.in 2005-03-11 20:28:55 +0100 @@@@ -628,6 +628,9 @@@@ /* Define to 1 if you have the `setupterm' function. */ #undef HAVE_SETUPTERM +/* Define to 1 if you have the header file. */ +#undef HAVE_SIGNAL_H + /* Define to 1 if you have the `sighold' function. */ #undef HAVE_SIGHOLD Index: configure.in --- configure.in.orig 2005-03-05 01:38:15 +0100 +++ configure.in 2005-03-11 20:28:55 +0100 @@@@ -735,7 +735,7 @@@@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \ - memory.h pwd.h select.h \ + memory.h pwd.h select.h signal.h \ stdlib.h stddef.h \ strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \ sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \ Index: configure --- configure.orig 2005-03-05 01:38:47 +0100 +++ configure 2005-03-11 20:28:55 +0100 @@@@ -22313,7 +22313,7 @@@@ for ac_header in fcntl.h float.h floatingpoint.h ieeefp.h limits.h \ - memory.h pwd.h select.h \ + memory.h pwd.h select.h signal.h \ stdlib.h stddef.h \ strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \ sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \ Index: include/Makefile.in --- include/Makefile.in.orig 2005-03-05 01:38:37 +0100 +++ include/Makefile.in 2005-03-11 20:28:55 +0100 @@@@ -300,14 +300,14 @@@@ my_semaphore.h my_pthread.h my_no_pthread.h raid.h \ errmsg.h my_global.h my_net.h my_alloc.h \ my_getopt.h sslopt-longopts.h my_dir.h \ - sslopt-vars.h sslopt-case.h $(BUILT_SOURCES) + sslopt-vars.h sslopt-case.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 Index: include/my_pthread.h --- include/my_pthread.h.orig 2005-03-05 01:38:14 +0100 +++ include/my_pthread.h 2005-03-11 20:28:55 +0100 @@@@ -229,7 +229,6 @@@@ #ifdef HAVE_rts_threads #define sigwait org_sigwait -#include #undef sigwait #endif #undef _REENTRANT /* Fix if _REENTRANT is in pthread.h */ @@@@ -240,6 +239,9 @@@@ #ifdef HAVE_THR_SETCONCURRENCY #include /* Probably solaris */ #endif +#ifdef HAVE_SIGNAL_H +#include +#endif #ifdef HAVE_SCHED_H #include #endif Index: mysys/default.c --- mysys/default.c.orig 2005-03-05 01:38:14 +0100 +++ mysys/default.c 2005-03-11 20:28:55 +0100 @@@@ -48,7 +48,7 @@@@ #elif defined(__NETWARE__) "sys:/etc/", #else -"/etc/", +"@@l_prefix@@/etc/mysql/", #endif #ifdef DATADIR DATADIR, Index: scripts/msql2mysql.sh --- scripts/msql2mysql.sh.orig 2005-03-05 01:38:16 +0100 +++ scripts/msql2mysql.sh 2005-03-11 20:28:55 +0100 @@@@ -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 -- $* Index: scripts/mysql_config.sh --- scripts/mysql_config.sh.orig 2005-03-05 01:38:14 +0100 +++ scripts/mysql_config.sh 2005-03-11 20:28:55 +0100 @@@@ -86,9 +86,9 @@@@ # Create options -libs="$ldflags -L$pkglibdir -lmysqlclient $client_libs" +libs="$ldflags -L$pkglibdir -lmysqlclient -lmysys $client_libs" libs=`echo "$libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'` -libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @@LIBS@@ @@openssl_libs@@" +libs_r="$ldflags -L$pkglibdir -lmysqlclient_r -lmysys @@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_install_db.sh --- scripts/mysql_install_db.sh.orig 2005-03-05 01:38:15 +0100 +++ scripts/mysql_install_db.sh 2005-03-11 22:18:52 +0100 @@@@ -168,9 +168,8 @@@@ # Create database directories mysql & test 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 # Initialize variables @@@@ -207,8 +206,6 @@@@ c_d="$c_d )" 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 @@@@ -281,9 +278,7 @@@@ INSERT INTO user (host,user) values ('localhost','');" 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); - 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',''); - REPLACE 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 fi @@@@ -387,10 +382,7 @@@@ if test "$in_rpm" = "0" then 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 mysql start" echo fi echo "Please report any problems with the @@scriptdir@@/mysqlbug script!" @ 1.3 log @upgrading package: mysql40 4.0.23a -> 4.0.24 @ text @@ 1.2 log @correct mysql_config script, it's libmysys and not libmysys_r @ text @d1 3 a3 67 --- 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 @@@@ -178,8 +177,6 @@@@ c_d="$c_d )" 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 @@@@ -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 then 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 mysql 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 @@@@ #elif defined(__NETWARE__) "sys:/etc/", #else -"/etc/", +"@@l_prefix@@/etc/mysql/", #endif #ifdef DATADIR DATADIR, --- config.h.in.orig 2004-12-09 12:21:30.331530371 +0100 +++ config.h.in 2004-12-09 12:21:33.941576868 +0100 d14 3 a16 22 --- include/my_pthread.h.orig 2004-10-28 02:48:34.000000000 +0200 +++ include/my_pthread.h 2004-12-09 12:23:37.673149500 +0100 @@@@ -229,7 +229,6 @@@@ #ifdef HAVE_rts_threads #define sigwait org_sigwait -#include #undef sigwait #endif #undef _REENTRANT /* Fix if _REENTRANT is in pthread.h */ @@@@ -240,6 +239,9 @@@@ #ifdef HAVE_THR_SETCONCURRENCY #include /* Probably solaris */ #endif +#ifdef HAVE_SIGNAL_H +#include +#endif #ifdef HAVE_SCHED_H #include #endif --- configure.in.orig 2004-10-28 02:48:38.000000000 +0200 +++ configure.in 2004-12-09 12:26:09.585078188 +0100 d26 4 a29 3 --- configure.orig 2004-10-28 02:48:59.000000000 +0200 +++ configure 2004-12-09 12:22:45.602487633 +0100 @@@@ -21408,7 +21408,7 @@@@ d39 3 a41 3 --- include/Makefile.in.orig 2004-10-28 02:48:55 +0200 +++ include/Makefile.in 2004-12-14 14:27:28 +0100 @@@@ -281,14 +281,14 @@@@ d59 42 d102 3 a104 3 --- scripts/mysql_config.sh.orig 2004-10-28 02:48:36 +0200 +++ scripts/mysql_config.sh 2004-12-14 14:29:04 +0100 @@@@ -86,7 +86,7 @@@@ d114 48 @ 1.1 log @In preparation to OpenPKG 2.3, finally remove obsoleted/end-of-life MySQL versions 3.23 and 4.0 in favor to the current stable production version 4.1 and the development version 5.0. The following shifting was done: none -> PLUS mysql40 4.0.22 BASE mysql 4.0.22 -> BASE mysql 4.1.8 PLUS mysql41 4.1.8 -> none EVAL mysql3 3.23.58 -> none @ text @d152 1 a152 1 +libs_r="$ldflags -L$pkglibdir -lmysqlclient_r -lmysys_r @@LIBS@@ @@openssl_libs@@" @