Commit ed8c737a authored by tsmith@ramayana.hindu.god's avatar tsmith@ramayana.hindu.god
Browse files

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
parents 35d9a05f fa5eb277

client/mysql_upgrade.c

+4 −0
Original line number Diff line number Diff line
@@ -456,7 +456,11 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res, 


  if (my_write(fd, query, strlen(query),

               MYF(MY_FNABP | MY_WME)))

  {

    my_close(fd, MYF(0));

    my_delete(query_file_path, MYF(0));

    die("Failed to write to '%s'", query_file_path);

  }



  ret= run_tool(mysql_path,

                ds_res,

client/mysqltest.c

+15 −4
Original line number Diff line number Diff line
@@ -1580,10 +1580,21 @@ void check_result(DYNAMIC_STRING* ds) 
      and then show the diff

    */

    char reject_file[FN_REFLEN];

    str_to_file(fn_format(reject_file, result_file_name, opt_logdir, ".reject",

                          *opt_logdir ? MY_REPLACE_DIR | MY_REPLACE_EXT :

                          MY_REPLACE_EXT),

                ds->str, ds->length);

    dirname_part(reject_file, result_file_name);



    if (access(reject_file, W_OK) == 0)

    {

      /* Result file directory is writable, save reject file there */

      fn_format(reject_file, result_file_name, NULL,

                ".reject", MY_REPLACE_EXT);

    }

    else

    {

      /* Put reject file in opt_logdir */

      fn_format(reject_file, result_file_name, opt_logdir,

                ".reject", MY_REPLACE_DIR | MY_REPLACE_EXT);

    }

    str_to_file(reject_file, ds->str, ds->length);



    dynstr_set(ds, NULL); /* Don't create a .log file */

debian/po/ca.po

+2 −2
Original line number Diff line number Diff line
@@ -162,9 +162,9 @@ msgid "" 
msgstr ""



#, fuzzy

#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html"

#~ msgid "Please also read http://dev.mysql.com/doc/mysql/en/upgrade.html"

#~ msgstr ""

#~ "Feu una ullada al document: http://www.mysql.com/doc/en/Upgrade.html"

#~ "Feu una ullada al document: http://dev.mysql.com/doc/mysql/en/upgrade.html"



#, fuzzy

#~ msgid ""

debian/po/cs.po

+2 −2
Original line number Diff line number Diff line
@@ -213,8 +213,8 @@ msgstr "" 
#~ "se tabulky mohly narušit! Tento skript také rozšiřuje tabulky privilegií, "

#~ "ovšem neměl by uživatelům přidat více práv, než měli dosud."



#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html"

#~ msgstr "Také si přečtěte http://www.mysql.com/doc/en/Upgrade.html"

#~ msgid "Please also read http://dev.mysql.com/doc/mysql/en/upgrade.html"

#~ msgstr "Také si přečtěte http://dev.mysql.com/doc/mysql/en/upgrade.html"



#~ msgid ""

#~ "MySQL will only install if you have a non-numeric hostname that is "

debian/po/da.po

+2 −2
Original line number Diff line number Diff line
@@ -215,8 +215,8 @@ msgstr "" 
#~ "kan blive delagt! Dette script forbedrer ogs rettighedstabellerne, men "

#~ "burde ikke give nogen bruger flere rettigheder, end han havde tidligere,"



#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html"

#~ msgstr "Ls ogs http://www.mysql.com/doc/en/Upgrade.html"

#~ msgid "Please also read http://dev.mysql.com/doc/mysql/en/upgrade.html"

#~ msgstr "Ls ogs http://dev.mysql.com/doc/mysql/en/upgrade.html"



#~ msgid "Install Hints"

#~ msgstr "Installationstips"