Commit 3facae33 authored by miguel@hegel.local's avatar miguel@hegel.local
Browse files

Sergei's MyODBC fix

parent 59a00868

client/mysqlcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,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
@@ -1948,7 +1948,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/resolve_stack_dump.c

+2 −2
Original line number Diff line number Diff line
@@ -231,9 +231,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))

    {

include/my_sys.h

+3 −3
Original line number Diff line number Diff line
@@ -549,9 +549,9 @@ extern my_bool real_open_cached_file(IO_CACHE *cache); 
extern void close_cached_file(IO_CACHE *cache);

File create_temp_file(char *to, const char *dir, const char *pfx,

		      int mode, myf MyFlags);

#define init_dynamic_array(A,B,C,D) _init_dynamic_array(A,B,C,D CALLER_INFO)

#define init_dynamic_array_ci(A,B,C,D) _init_dynamic_array(A,B,C,D ORIG_CALLER_INFO)

extern my_bool _init_dynamic_array(DYNAMIC_ARRAY *array,uint element_size,

#define my_init_dynamic_array(A,B,C,D) init_dynamic_array(A,B,C,D CALLER_INFO)

#define my_init_dynamic_array_ci(A,B,C,D) init_dynamic_array(A,B,C,D ORIG_CALLER_INFO)

extern my_bool init_dynamic_array(DYNAMIC_ARRAY *array,uint element_size,

	  uint init_alloc,uint alloc_increment CALLER_INFO_PROTO);

extern my_bool insert_dynamic(DYNAMIC_ARRAY *array,gptr element);

extern byte *alloc_dynamic(DYNAMIC_ARRAY *array);

mysys/array.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
  even if space allocation failed

*/



my_bool _init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size,

my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size,

		   uint init_alloc, uint alloc_increment CALLER_INFO_PROTO)

{

  DBUG_ENTER("init_dynamic_array");