mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix applied to allow building of 4.0.20 for NetWare

Browse source 
client/mysqltest.c:
  Fix compilation errors for NetWare
This commit is contained in:
unknown 2004-06-01 19:35:09 -01:00
commit 1a36eff30c
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/mysqltest.c
View file

@ -185,7 +185,7 @@ typedef struct
*/ */
static char *subst_env_var(const char *cmd); static char *subst_env_var(const char *cmd);
static int my_popen(const char *cmd, const char *mode); static FILE *my_popen(const char *cmd, const char *mode);
#define popen(A,B) my_popen((A),(B)) #define popen(A,B) my_popen((A),(B))
#endif /* __NETWARE__ */ #endif /* __NETWARE__ */
@ -3509,6 +3509,7 @@ static void get_replace_column(struct st_query *q)
static char *subst_env_var(const char *str) static char *subst_env_var(const char *str)
{ {
char *result; char *result;
char *pos;
result= pos= my_malloc(MAX_QUERY, MYF(MY_FAE)); result= pos= my_malloc(MAX_QUERY, MYF(MY_FAE));
while (*str) while (*str)
@ -3528,7 +3529,7 @@ static char *subst_env_var(const char *str)
*str && !isspace(*str) && *str != '\\' && *str != '/' && *str && !isspace(*str) && *str != '\\' && *str != '/' &&
*str != '$'; *str != '$';
str++) str++)
*env_pos++ *str; *env_pos++= *str;
*env_pos= 0; *env_pos= 0;
if (!(subst= getenv(env_var))) if (!(subst= getenv(env_var)))
@ -3571,11 +3572,11 @@ static char *subst_env_var(const char *str)
#undef popen /* Remove wrapper */ #undef popen /* Remove wrapper */
int my_popen(const char *cmd, const char *mode __attribute__((unused)) t) FILE *my_popen(const char *cmd, const char *mode __attribute__((unused)))
{ {
char *subst_cmd; char *subst_cmd;
int res_file; FILE *res_file;
subst_cmd= subst_env_var(cmd); subst_cmd= subst_env_var(cmd);
res_file= popen(subst_cmd, "r0"); res_file= popen(subst_cmd, "r0");
my_free(subst_cmd, MYF(0)); my_free(subst_cmd, MYF(0));