diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2011-01-13 09:15:22 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2011-01-13 09:15:22 +0000 |
| commit | 186cfdea42d53328d6a34ac7e5b2aa0eefa96cfc (patch) | |
| tree | bd17ea672934787586500ea95fdf1e8df7b853aa /databases | |
| parent | update to 3.51.1 (diff) | |
Fix init_embedded_server when argc=0.
Submitted by: fluffy
Obtained from: MySQL Bug #57931
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=267728
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql55-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysql55-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql55-server/files/patch-libmysqld_lib_sql.cc | 13 | ||||
| -rw-r--r-- | databases/percona55-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/percona55-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/percona55-server/files/patch-libmysqld_lib_sql.cc | 13 |
6 files changed, 30 insertions, 2 deletions
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index fb471d1dea78..861f8358076d 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -6,6 +6,7 @@ # PORTNAME= mysql +PORTREVISION= 2 PKGNAMESUFFIX= -client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index d1f29e8bb903..8b0d578e7852 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= mysql PORTVERSION= 5.5.8 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-5.5 diff --git a/databases/mysql55-server/files/patch-libmysqld_lib_sql.cc b/databases/mysql55-server/files/patch-libmysqld_lib_sql.cc new file mode 100644 index 000000000000..bc520caf038e --- /dev/null +++ b/databases/mysql55-server/files/patch-libmysqld_lib_sql.cc @@ -0,0 +1,13 @@ +--- libmysqld/lib_sql.cc.orig 2011-01-13 09:53:29.000000000 +0100 ++++ libmysqld/lib_sql.cc 2011-01-13 09:54:03.000000000 +0100 +@@ -510,8 +510,8 @@ + return 1; + defaults_argc= *argcp; + defaults_argv= *argvp; +- remaining_argc= argc; +- remaining_argv= argv; ++ remaining_argc= *argcp; ++ remaining_argv= *argvp; + + /* Must be initialized early for comparison of options name */ + system_charset_info= &my_charset_utf8_general_ci; diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile index fb471d1dea78..861f8358076d 100644 --- a/databases/percona55-client/Makefile +++ b/databases/percona55-client/Makefile @@ -6,6 +6,7 @@ # PORTNAME= mysql +PORTREVISION= 2 PKGNAMESUFFIX= -client COMMENT= Multithreaded SQL database (client) diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index d1f29e8bb903..8b0d578e7852 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= mysql PORTVERSION= 5.5.8 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-5.5 diff --git a/databases/percona55-server/files/patch-libmysqld_lib_sql.cc b/databases/percona55-server/files/patch-libmysqld_lib_sql.cc new file mode 100644 index 000000000000..bc520caf038e --- /dev/null +++ b/databases/percona55-server/files/patch-libmysqld_lib_sql.cc @@ -0,0 +1,13 @@ +--- libmysqld/lib_sql.cc.orig 2011-01-13 09:53:29.000000000 +0100 ++++ libmysqld/lib_sql.cc 2011-01-13 09:54:03.000000000 +0100 +@@ -510,8 +510,8 @@ + return 1; + defaults_argc= *argcp; + defaults_argv= *argvp; +- remaining_argc= argc; +- remaining_argv= argv; ++ remaining_argc= *argcp; ++ remaining_argv= *argvp; + + /* Must be initialized early for comparison of options name */ + system_charset_info= &my_charset_utf8_general_ci; |