Commit b79f2f51 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql-4.0 

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents 10135e11 900788b2

client/mysqlcheck.c

+2 −2
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ int main(int argc, char **argv) 
    exit(EX_MYSQLERR);



  if (opt_auto_repair &&

      init_dynamic_array(&tables4repair, sizeof(char)*(NAME_LEN*2+2),16,64))

      my_init_dynamic_array(&tables4repair, sizeof(char)*(NAME_LEN*2+2),16,64))

  {

    first_error = 1;

    goto end;

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -2360,7 +2360,7 @@ int main(int argc, char** argv) 
  file_stack_end = file_stack + MAX_INCLUDE_DEPTH;

  cur_file = file_stack;

  lineno   = lineno_stack;

  init_dynamic_array(&q_lines, sizeof(struct st_query*), INIT_Q_LINES,

  my_init_dynamic_array(&q_lines, sizeof(struct st_query*), INIT_Q_LINES,

		     INIT_Q_LINES);

  memset(block_stack, 0, sizeof(block_stack));

  block_stack_end = block_stack + BLOCK_STACK_DEPTH;

extra/mysql_install.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int init_question_widget(QUESTION_WIDGET* w, const char* question, 
  }

  w->question = question;

  w->default_ind = default_ind;

  if (init_dynamic_array(&w->answers,sizeof(char*),

  if (my_init_dynamic_array(&w->answers,sizeof(char*),

			 ANSWERS_CHUNCK,ANSWERS_CHUNCK))

    die("Out of memory");

  return 0;

extra/resolve_stack_dump.c

+2 −2
Original line number Diff line number Diff line
@@ -230,9 +230,9 @@ static int init_sym_entry(SYM_ENTRY* se, char* buf) 
static void init_sym_table()

{

  char buf[512];

  if(init_dynamic_array(&sym_table, sizeof(SYM_ENTRY), INIT_SYM_TABLE,

  if(my_init_dynamic_array(&sym_table, sizeof(SYM_ENTRY), INIT_SYM_TABLE,

		     INC_SYM_TABLE))

    die("Failed in init_dynamic_array() -- looks like out of memory problem");

    die("Failed in my_init_dynamic_array() -- looks like out of memory problem");



  while(fgets(buf, sizeof(buf), fp_sym))

    {

fs/database.c

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ int db_show_field(char *b,const char *database,const char *table, const char *fi 
   if (!(database[0] && table[0] && field[0]))

      DBUG_RETURN(-1);



   init_dynamic_array(&field_array, sizeof(buff), 4096, 1024);

   my_init_dynamic_array(&field_array, sizeof(buff), 4096, 1024);



   if (mysql_select_db(sock,database))

   {
@@ -593,7 +593,7 @@ gptr db_load_functions() 
   int i=0;

   struct func_st func;

   DBUG_ENTER("db_load_functions");

   init_dynamic_array(&functions_array, sizeof(struct func_st), 4096, 1024);

   my_init_dynamic_array(&functions_array, sizeof(struct func_st), 4096, 1024);

   while(functions[i]) {

      strcpy(func.type_s,   functions[i]);   /* Type in string: "table"`               */

      strcpy(func.filename, functions[i+1]); /* Name like it appears on FS: "count"    */