Commit 3616b5e3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0 

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/field.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
parents 92e7cf15 a7ec72b2

client/mysql_upgrade.c

+20 −9
Original line number Diff line number Diff line
@@ -345,15 +345,17 @@ static int create_defaults_file(const char *path, const char *forced_path) 
      }

      dynstr_set(&buf, NULL);

    }

    if (dynstr_append_mem(&buf, "\n", 1)

       || dynstr_append_mem(&buf, d->name, d->n_len)

       || (d->v_len && (dynstr_append_mem(&buf, "=", 1)

       || dynstr_append_mem(&buf, d->value, d->v_len))))

    if (dynstr_append_mem(&buf, "\n", 1) ||

        dynstr_append_mem(&buf, d->name, d->n_len) ||

        (d->v_len && (dynstr_append_mem(&buf, "=", 1) ||

                      dynstr_append_mem(&buf, d->value, d->v_len))))

    {

      ret= 1;

      goto error;

    }

    my_delete((gptr)d, MYF(0));

    my_free((gptr) d, MYF(0));



    list_pop(extra_defaults);                   /* pop off the head */

  }

  if (my_write(defaults_file, buf.str, buf.length, MYF(MY_FNABP | MY_WME)))
@@ -451,10 +453,10 @@ int main(int argc, char **argv) 
  char *forced_extra_defaults;

  char *local_defaults_group_suffix;

  const char *script_line;

  char *upgrade_defaults_path; 

  char *upgrade_defaults_path= NULL; 

  char *defaults_to_use= NULL;

  int upgrade_defaults_created= 0;

  

  int no_defaults;

  char path[FN_REFLEN];

  DYNAMIC_STRING cmdline;
@@ -464,6 +466,10 @@ int main(int argc, char **argv) 
#endif



  /* Check if we are forced to use specific defaults */

  no_defaults= 0;

  if (argc >= 2 && !strcmp(argv[1],"--no-defaults"))

    no_defaults= 1;



  get_defaults_options(argc, argv,

                       &forced_defaults_file, &forced_extra_defaults,

                       &local_defaults_group_suffix);
@@ -578,7 +584,9 @@ int main(int argc, char **argv) 
  if (defaults_to_use)

  {

    dynstr_append(&cmdline, " ");

    dynstr_append_os_quoted(&cmdline, "--defaults-extra-file=", 

    dynstr_append_os_quoted(&cmdline,

                            (no_defaults ? "--defaults-file=" :

                             "--defaults-extra-file="),

                            defaults_to_use, NullS);

  }
@@ -652,7 +660,9 @@ int main(int argc, char **argv) 
  if (defaults_to_use)

  {

    dynstr_append(&cmdline, " ");

    dynstr_append_os_quoted(&cmdline, "--defaults-extra-file=", 

    dynstr_append_os_quoted(&cmdline,

                            (no_defaults ? "--defaults-file=" :

                             "--defaults-extra-file="),

                            defaults_to_use, NullS);

  }

  dynstr_append(&cmdline, " ");
@@ -684,6 +694,7 @@ int main(int argc, char **argv) 
  if (upgrade_defaults_created)

    my_delete(upgrade_defaults_path, MYF(0));

  

  my_free(upgrade_defaults_path, MYF(MY_ALLOW_ZERO_PTR));

  my_end(info_flag ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);

  return ret;

}

client/mysqltest.c

+2 −2
Original line number Diff line number Diff line
@@ -6726,11 +6726,11 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern, 


        if (back_ref_num >= 0 && back_ref_num <= (int)r.re_nsub)

        {

          int start_off,end_off;

          regoff_t start_off, end_off;

          if ((start_off=subs[back_ref_num].rm_so) > -1 &&

              (end_off=subs[back_ref_num].rm_eo) > -1)

          {

            int block_len= end_off - start_off;

            int block_len= (int) (end_off - start_off);

            memcpy(res_p,str_p + start_off, block_len);

            res_p += block_len;

          }

cmd-line-utils/readline/xmalloc.c

+3 −4
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ 
/* **************************************************************** */



static void

memory_error_and_abort (fname)

     char *fname;

memory_error_and_abort(const char *fname)

{

  fprintf (stderr, "%s: out of virtual memory\n", fname);

  exit (2);
@@ -57,7 +56,7 @@ xmalloc (bytes) 


  temp = malloc (bytes);

  if (temp == 0)

    memory_error_and_abort ((char*) "xmalloc");

    memory_error_and_abort("xmalloc");

  return (temp);

}
@@ -71,7 +70,7 @@ xrealloc (pointer, bytes) 
  temp = pointer ? realloc (pointer, bytes) : malloc (bytes);



  if (temp == 0)

    memory_error_and_abort ((char*) "xrealloc");

    memory_error_and_abort("xrealloc");

  return (temp);

}

include/my_dbug.h

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ extern void _db_unlock_file(void); 
#define DBUG_ASSERT(A) assert(A)

#define DBUG_EXECUTE_IF(keyword,a1) \

        {if (_db_on_) {if (_db_strict_keyword_ (keyword)) { a1 }}}

#define IF_DBUG(A) A

#else						/* No debugger */



#define DBUG_ENTER(a1)
@@ -98,6 +99,7 @@ extern void _db_unlock_file(void); 
#define DBUG_OUTPUT(A)

#define DBUG_ASSERT(A) {}

#define DBUG_LEAVE

#define IF_DBUG(A)

#endif

#ifdef	__cplusplus

}

sql/field.cc

+3 −3
Original line number Diff line number Diff line
@@ -6144,7 +6144,7 @@ int Field_string::cmp(const char *a_ptr, const char *b_ptr) 


void Field_string::sort_string(char *to,uint length)

{

  uint tmp=my_strnxfrm(field_charset,

  IF_DBUG(uint tmp=) my_strnxfrm(field_charset,

                                 (unsigned char *) to, length,

                                 (unsigned char *) ptr, field_length);

  DBUG_ASSERT(tmp == length);