diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2009-07-21 06:05:28 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2009-07-21 06:05:28 +0000 |
| commit | 66dd12dd6be164330563c2bd0a7ae6991a9173fa (patch) | |
| tree | 5b3b39555f5b5b1bd08f8a80e8c6dbd118c5fcd8 /databases/mysql51-server | |
| parent | - set MAKE_JOBS_UNSAFE (diff) | |
Update to 5.1.36 release.
Notes
Notes:
svn path=/head/; revision=238147
Diffstat (limited to 'databases/mysql51-server')
| -rw-r--r-- | databases/mysql51-server/Makefile | 6 | ||||
| -rw-r--r-- | databases/mysql51-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mysql51-server/files/patch-client_mysql.cc | 27 |
3 files changed, 5 insertions, 34 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 9f004d494e4d..1fde344f2985 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.1.35 +PORTVERSION= 5.1.36 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -169,8 +169,6 @@ MAN1= mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \ mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \ mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mysqltest.1 -MAN8= mysqlmanager.8 - USE_LDCONFIG= ${PREFIX}/lib/mysql CONFIGURE_ARGS+=--without-server @@ -180,7 +178,7 @@ post-patch: @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in ${WRKSRC}/mysys/Makefile.in ${WRKSRC}/dbug/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/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|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in post-install: diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index 0532d5dfe527..16db22a2a9cd 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.1.35.tar.gz) = 327bffc7a2a5fd4471fbbaab125275cd -SHA256 (mysql-5.1.35.tar.gz) = ea1ee8963d2e94167f32d73099936a4fdacc1a501d0155a73e4f54e705340b5a -SIZE (mysql-5.1.35.tar.gz) = 35152597 +MD5 (mysql-5.1.36.tar.gz) = 18e694c4ecbe851fe8e21e1668116c46 +SHA256 (mysql-5.1.36.tar.gz) = 38ab56ab593090dc3d708edc42c1e4f61b2ee6ed42b5af1ae3072f7986273a75 +SIZE (mysql-5.1.36.tar.gz) = 36010524 diff --git a/databases/mysql51-server/files/patch-client_mysql.cc b/databases/mysql51-server/files/patch-client_mysql.cc deleted file mode 100644 index 73bccef5bdb9..000000000000 --- a/databases/mysql51-server/files/patch-client_mysql.cc +++ /dev/null @@ -1,27 +0,0 @@ ---- client/mysql.cc.orig 2007-11-13 13:29:42 +0000 -+++ client/mysql.cc 2008-05-01 19:16:09 +0000 -@@ -2636,9 +2636,12 @@ - { - while((field = mysql_fetch_field(result))) - { -- tee_fprintf(PAGER, "<TH>%s</TH>", (field->name ? -- (field->name[0] ? field->name : -- " ") : "NULL")); -+ tee_fputs("<TH>", PAGER); -+ if (field->name && field->name[0]) -+ xmlencode_print(field->name, field->name_length); -+ else -+ tee_fputs(field->name ? " " : "NULL", PAGER); -+ tee_fputs("</TH>", PAGER); - } - (void) tee_fputs("</TR>", PAGER); - } -@@ -2651,7 +2654,7 @@ - for (uint i=0; i < mysql_num_fields(result); i++) - { - (void) tee_fputs("<TD>", PAGER); -- safe_put_field(cur[i],lengths[i]); -+ xmlencode_print(cur[i], lengths[i]); - (void) tee_fputs("</TD>", PAGER); - } - (void) tee_fputs("</TR>", PAGER); |