Commit 6d89aa73 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jimw/my/mysql-5.0-clean
parents 3cd4b7a9 a1355f91

mysys/default.c

+9 −4
Original line number Diff line number Diff line
@@ -152,10 +152,15 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv, 
      }

      else if (defaults_extra_file)

      {

	if (search_default_file(func, func_ctx, NullS,

                                defaults_extra_file) < 0)

        if (search_default_file_with_ext(func, func_ctx, "", "",

                                         defaults_extra_file, 0) < 0)

	  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

  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))

  {

sql/sql_show.cc

+3 −3
Original line number Diff line number Diff line
@@ -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]);

        }

      }

#else

      *end= 0;

#endif

      if (tables->schema_table)      // any user has 'select' privilege on all 

                                     // I_S table columns

        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

        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[2]->store(file_name, strlen(file_name), cs);

      table->field[3]->store(field->field_name, strlen(field->field_name),