Update to 4.1.22 release and fix the long standing ORDER BY bug.

Requested by:	many
This commit is contained in:
Alex Dupre 2006-11-28 07:24:17 +00:00
parent 5ffe8f1d53
commit a6ba15fc9d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=178151
5 changed files with 13 additions and 11 deletions

View file

@ -6,7 +6,6 @@
# #
PORTNAME= mysql PORTNAME= mysql
PORTREVISION= 0
PKGNAMESUFFIX= -client PKGNAMESUFFIX= -client
COMMENT= Multithreaded SQL database (client) COMMENT= Multithreaded SQL database (client)

View file

@ -6,7 +6,6 @@
# #
PORTNAME= mysql PORTNAME= mysql
PORTREVISION= 0
PKGNAMESUFFIX= -scripts PKGNAMESUFFIX= -scripts
COMMENT= Multithreaded SQL database (scripts) COMMENT= Multithreaded SQL database (scripts)

View file

@ -6,7 +6,7 @@
# #
PORTNAME?= mysql PORTNAME?= mysql
PORTVERSION= 4.1.21 PORTVERSION= 4.1.22
PORTREVISION?= 0 PORTREVISION?= 0
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITES= ${MASTER_SITE_MYSQL}
@ -120,6 +120,8 @@ PLIST_SUB+= NDB="@comment "
MAN1= myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \ MAN1= myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \
mysqld_safe.1 mysql.server.1 perror.1 replace.1 mysqld_safe.1 mysql.server.1 perror.1 replace.1
MAN8= mysqld.8
INFO= mysql INFO= mysql
pre-fetch: pre-fetch:
@ -146,7 +148,7 @@ post-patch:
@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in
@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in @${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
.if defined(WITH_PROC_SCOPE_PTH) .if defined(WITH_PROC_SCOPE_PTH)

View file

@ -1,3 +1,3 @@
MD5 (mysql-4.1.21.tar.gz) = d3e0127078981590095d331d4e745d73 MD5 (mysql-4.1.22.tar.gz) = 37b4479951fa0cf052269d27c41ca200
SHA256 (mysql-4.1.21.tar.gz) = 43a23ab44fdbd4893e1f5076a2f7fa1540afbaa617e772202099acd24af0e3c5 SHA256 (mysql-4.1.22.tar.gz) = 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9
SIZE (mysql-4.1.21.tar.gz) = 17624947 SIZE (mysql-4.1.22.tar.gz) = 17761101

View file

@ -1,11 +1,13 @@
--- man/Makefile.in.orig Thu Dec 22 16:04:55 2005 --- man/Makefile.in.orig Fri Nov 3 03:18:34 2006
+++ man/Makefile.in Thu Dec 22 16:05:21 2005 +++ man/Makefile.in Mon Nov 27 23:01:29 2006
@@ -321,7 +321,7 @@ @@ -327,8 +327,8 @@
vio_dir = @vio_dir@ vio_dir = @vio_dir@
vio_libs = @vio_libs@ vio_libs = @vio_libs@
zlib_dir = @zlib_dir@ zlib_dir = @zlib_dir@
-man1_MANS = @man1_files@ -man1_MANS = @man1_files@
-man8_MANS = @man8_files@
+man1_MANS = +man1_MANS =
EXTRA_DIST = $(man1_MANS) +man8_MANS =
EXTRA_DIST = $(man1_MANS) $(man8_MANS)
all: all-am all: all-am