Commit 3175a06a authored by Alfranio Correia's avatar Alfranio Correia
Browse files

merge 5.1 --> 5.1-rpl

parents 7434596b 30d8a8f9

.bzrignore

+25 −0
Original line number Diff line number Diff line
@@ -3036,3 +3036,28 @@ mysql-test/bug36522.tar 
mysql-test/t.log

mysql-test/tps.log

libmysqld/event_parse_data.cc

autom4te.cache

sql/share/czech

sql/share/danish

sql/share/dutch

sql/share/english

sql/share/estonian

sql/share/french

sql/share/german

sql/share/greek

sql/share/hungarian

sql/share/italian

sql/share/japanese

sql/share/japanese-sjis

sql/share/korean

sql/share/norwegian

sql/share/norwegian-ny

sql/share/polish

sql/share/portuguese

sql/share/romanian

sql/share/russian

sql/share/serbian

sql/share/slovak

sql/share/spanish

sql/share/swedish

sql/share/ukrainian

client/mysql.cc

+2 −0
Original line number Diff line number Diff line
@@ -1627,8 +1627,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    opt_nopager= 1;

    break;

  case OPT_MYSQL_PROTOCOL:

#ifndef EMBEDDED_LIBRARY

    opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,

                                    opt->name);

#endif

    break;

  case OPT_SERVER_ARG:

#ifdef EMBEDDED_LIBRARY

client/mysqlcheck.c

+7 −2
Original line number Diff line number Diff line
@@ -517,9 +517,14 @@ static int process_all_tables_in_db(char *database) 
  LINT_INIT(res);

  if (use_db(database))

    return 1;

  if (mysql_query(sock, "SHOW /*!50002 FULL*/ TABLES") ||

	!((res= mysql_store_result(sock))))

  if ((mysql_query(sock, "SHOW /*!50002 FULL*/ TABLES") &&

       mysql_query(sock, "SHOW TABLES")) ||

      !(res= mysql_store_result(sock)))

  {

    my_printf_error(0, "Error: Couldn't get table list for database %s: %s",

		    MYF(0), database, mysql_error(sock));

    return 1;

  }



  num_columns= mysql_num_fields(res);

dbug/dbug.c

+1 −7
Original line number Diff line number Diff line
@@ -1851,13 +1851,7 @@ static void DBUGOpenFile(CODE_STATE *cs, 
      else

      {

        newfile= !EXISTS(name);

        if (!(fp= fopen(name,

#if defined(MSDOS) || defined(__WIN__)

		append ? "a+c" : "wc"

#else

                append ? "a+" : "w"

#endif

		)))

        if (!(fp= fopen(name, append ? "a+" : "w")))

        {

          (void) fprintf(stderr, ERR_OPEN, cs->process, name);

          perror("");

extra/perror.c

+38 −2
Original line number Diff line number Diff line
@@ -185,11 +185,36 @@ static const char *get_ha_error_msg(int code) 
}





#if defined(__WIN__)

static my_bool print_win_error_msg(DWORD error, my_bool verbose)

{

  LPTSTR s;

  if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |

                    FORMAT_MESSAGE_FROM_SYSTEM,

                    NULL, error, 0, (LPTSTR)&s, 0,

                    NULL))

  {

    if (verbose)

      printf("Win32 error code %d: %s", error, s);

    else

      puts(s);

    LocalFree(s);

    return 0;

  }

  return 1;

}

#endif







int main(int argc,char *argv[])

{

  int error,code,found;

  const char *msg;

  char *unknown_error = 0;

#if defined(__WIN__)

  my_bool skip_win_message= 0;

#endif

  MY_INIT(argv[0]);



  if (get_options(&argc,&argv))
@@ -293,9 +318,20 @@ int main(int argc,char *argv[]) 
      }

      if (!found)

      {

#if defined(__WIN__)

        if (!(skip_win_message= !print_win_error_msg((DWORD)code, verbose)))

        {

#endif

          fprintf(stderr,"Illegal error code: %d\n",code);

          error=1;

#if defined(__WIN__)

        }

#endif

      }

#if defined(__WIN__)

      if (!skip_win_message)

        print_win_error_msg((DWORD)code, verbose);

#endif

    }

  }