Commit 019b9732 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
parents 7d81acb5 c0eae8f0

mysql-test/my_manage.c

+4 −1
Original line number Diff line number Diff line
@@ -230,7 +230,10 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)), 
                          char *user, char *password, int port,char *tmp_dir)

{

  arg_list_t al;

  int err= 0, i;

  int err= 0;

#ifndef __WIN__

  int i;

#endif

  char trash[FN_REFLEN];



  /* mysqladmin file */

mysql-test/mysql_test_run_new.c

+0 −1
Original line number Diff line number Diff line
@@ -1716,7 +1716,6 @@ int main(int argc, char **argv) 
      int* handle;

      char test[FN_LEN];

      char mask[FN_REFLEN];

      char *p;

      int position;



      /* single test */

sql/item_func.cc

+0 −1
Original line number Diff line number Diff line
@@ -3252,7 +3252,6 @@ Item *get_system_var(THD *thd, enum_var_type var_type, LEX_STRING name, 
		     LEX_STRING component)

{

  sys_var *var;

  char buff[MAX_SYS_VAR_LENGTH*2+4+8], *pos;

  LEX_STRING *base_name, *component_name;



  if (component.str == 0 &&

strings/ctype-simple.c

+1 −1
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ int my_longlong10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)), 
  while (long_val != 0)

  {

    long quo= long_val/10;

    *--p = '0' + (long_val - quo*10);

    *--p = (char) ('0' + (long_val - quo*10));

    long_val= quo;

  }

strings/ctype-ucs2.c

+1 −1
Original line number Diff line number Diff line
@@ -1043,7 +1043,7 @@ int my_ll10tostr_ucs2(CHARSET_INFO *cs __attribute__((unused)), 
  while (long_val != 0)

  {

    long quo= long_val/10;

    *--p = '0' + (long_val - quo*10);

    *--p = (char) ('0' + (long_val - quo*10));

    long_val= quo;

  }