mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal:/home/bk/mysql-5.0

Browse source 
into mysql.com:/home/jimw/my/mysql-5.0-clean
This commit is contained in:
jimw@mysql.com 2005-05-07 08:26:00 -07:00
commit b4dcd8f4ab
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mysys/default.c
View file

@ -152,10 +152,15 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv,
} }
else if (defaults_extra_file) else if (defaults_extra_file)
{ {
if (search_default_file(func, func_ctx, NullS, if (search_default_file_with_ext(func, func_ctx, "", "",
defaults_extra_file) < 0) defaults_extra_file, 0) < 0)
goto err; /* Fatal error */ goto err; /* Fatal error */
if (error > 0)
{
fprintf(stderr, "Could not open required defaults file: %s\n",
defaults_extra_file);
goto err;
}
} }
} }
} }
@ -526,7 +531,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
} }
#endif #endif
if (!(fp= my_fopen(name, O_RDONLY, MYF(0)))) if (!(fp= my_fopen(name, O_RDONLY, MYF(0))))
return 0; /* Ignore wrong files */ return 1; /* Ignore wrong files */
while (fgets(buff, sizeof(buff) - 1, fp)) while (fgets(buff, sizeof(buff) - 1, fp))
{ {

6
sql/sql_show.cc
View file

@ -2317,9 +2317,6 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables,
end=strmov(end,grant_types.type_names[bitnr]); end=strmov(end,grant_types.type_names[bitnr]);
} }
} }
#else
*end= 0;
#endif
if (tables->schema_table) // any user has 'select' privilege on all if (tables->schema_table) // any user has 'select' privilege on all
// I_S table columns // I_S table columns
table->field[17]->store(grant_types.type_names[0], table->field[17]->store(grant_types.type_names[0],
@ -2327,6 +2324,9 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables,
else else
table->field[17]->store(tmp+1,end == tmp ? 0 : (uint) (end-tmp-1), cs); table->field[17]->store(tmp+1,end == tmp ? 0 : (uint) (end-tmp-1), cs);
#else
*end= 0;
#endif
table->field[1]->store(base_name, strlen(base_name), cs); table->field[1]->store(base_name, strlen(base_name), cs);
table->field[2]->store(file_name, strlen(file_name), cs); table->field[2]->store(file_name, strlen(file_name), cs);
table->field[3]->store(field->field_name, strlen(field->field_name), table->field[3]->store(field->field_name, strlen(field->field_name),