Fix init_embedded_server when argc=0.

Submitted by:	fluffy
Obtained from:	MySQL Bug #57931
Feature safe:	yes
This commit is contained in:
Alex Dupre 2011-01-13 09:15:22 +00:00
parent 23112b2f96
commit 186cfdea42
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=267728
6 changed files with 30 additions and 2 deletions

View file

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

View file

@ -7,7 +7,7 @@
PORTNAME?= mysql PORTNAME?= mysql
PORTVERSION= 5.5.8 PORTVERSION= 5.5.8
PORTREVISION?= 2 PORTREVISION?= 3
CATEGORIES= databases ipv6 CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.5 MASTER_SITE_SUBDIR= MySQL-5.5

View file

@ -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;

View file

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

View file

@ -7,7 +7,7 @@
PORTNAME?= mysql PORTNAME?= mysql
PORTVERSION= 5.5.8 PORTVERSION= 5.5.8
PORTREVISION?= 2 PORTREVISION?= 3
CATEGORIES= databases ipv6 CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.5 MASTER_SITE_SUBDIR= MySQL-5.5

View file

@ -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;