Commit 900788b2 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com

init_dynamic_array MyODBC compatibility fix

parent e2f1993a
...@@ -615,7 +615,7 @@ int main(int argc, char **argv) ...@@ -615,7 +615,7 @@ int main(int argc, char **argv)
exit(EX_MYSQLERR); exit(EX_MYSQLERR);
if (opt_auto_repair && 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; first_error = 1;
goto end; goto end;
......
...@@ -2360,7 +2360,7 @@ int main(int argc, char** argv) ...@@ -2360,7 +2360,7 @@ int main(int argc, char** argv)
file_stack_end = file_stack + MAX_INCLUDE_DEPTH; file_stack_end = file_stack + MAX_INCLUDE_DEPTH;
cur_file = file_stack; cur_file = file_stack;
lineno = lineno_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); INIT_Q_LINES);
memset(block_stack, 0, sizeof(block_stack)); memset(block_stack, 0, sizeof(block_stack));
block_stack_end = block_stack + BLOCK_STACK_DEPTH; block_stack_end = block_stack + BLOCK_STACK_DEPTH;
......
...@@ -135,7 +135,7 @@ static int init_question_widget(QUESTION_WIDGET* w, const char* question, ...@@ -135,7 +135,7 @@ static int init_question_widget(QUESTION_WIDGET* w, const char* question,
} }
w->question = question; w->question = question;
w->default_ind = default_ind; 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)) ANSWERS_CHUNCK,ANSWERS_CHUNCK))
die("Out of memory"); die("Out of memory");
return 0; return 0;
......
...@@ -230,9 +230,9 @@ static int init_sym_entry(SYM_ENTRY* se, char* buf) ...@@ -230,9 +230,9 @@ static int init_sym_entry(SYM_ENTRY* se, char* buf)
static void init_sym_table() static void init_sym_table()
{ {
char buf[512]; 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)) 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)) while(fgets(buf, sizeof(buf), fp_sym))
{ {
......
...@@ -243,7 +243,7 @@ int db_show_field(char *b,const char *database,const char *table, const char *fi ...@@ -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])) if (!(database[0] && table[0] && field[0]))
DBUG_RETURN(-1); 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)) if (mysql_select_db(sock,database))
{ {
...@@ -593,7 +593,7 @@ gptr db_load_functions() ...@@ -593,7 +593,7 @@ gptr db_load_functions()
int i=0; int i=0;
struct func_st func; struct func_st func;
DBUG_ENTER("db_load_functions"); 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]) { while(functions[i]) {
strcpy(func.type_s, functions[i]); /* Type in string: "table"` */ strcpy(func.type_s, functions[i]); /* Type in string: "table"` */
strcpy(func.filename, functions[i+1]); /* Name like it appears on FS: "count" */ strcpy(func.filename, functions[i+1]); /* Name like it appears on FS: "count" */
......
...@@ -651,9 +651,9 @@ extern my_bool real_open_cached_file(IO_CACHE *cache); ...@@ -651,9 +651,9 @@ extern my_bool real_open_cached_file(IO_CACHE *cache);
extern void close_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, File create_temp_file(char *to, const char *dir, const char *pfx,
int mode, myf MyFlags); int mode, myf MyFlags);
#define init_dynamic_array(A,B,C,D) _init_dynamic_array(A,B,C,D CALLER_INFO) #define my_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) #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, extern my_bool init_dynamic_array(DYNAMIC_ARRAY *array,uint element_size,
uint init_alloc,uint alloc_increment CALLER_INFO_PROTO); uint init_alloc,uint alloc_increment CALLER_INFO_PROTO);
extern my_bool insert_dynamic(DYNAMIC_ARRAY *array,gptr element); extern my_bool insert_dynamic(DYNAMIC_ARRAY *array,gptr element);
extern byte *alloc_dynamic(DYNAMIC_ARRAY *array); extern byte *alloc_dynamic(DYNAMIC_ARRAY *array);
......
...@@ -122,7 +122,7 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, ...@@ -122,7 +122,7 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
if ((sort_keys=(uchar **)my_malloc(keys*(sort_length+sizeof(char*))+ if ((sort_keys=(uchar **)my_malloc(keys*(sort_length+sizeof(char*))+
HA_FT_MAXLEN, MYF(0)))) HA_FT_MAXLEN, MYF(0))))
{ {
if (init_dynamic_array(&buffpek, sizeof(BUFFPEK), maxbuffer, if (my_init_dynamic_array(&buffpek, sizeof(BUFFPEK), maxbuffer,
maxbuffer/2)) maxbuffer/2))
my_free((gptr) sort_keys,MYF(0)); my_free((gptr) sort_keys,MYF(0));
else else
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
even if space allocation failed 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 init_alloc,
uint alloc_increment CALLER_INFO_PROTO) uint alloc_increment CALLER_INFO_PROTO)
{ {
......
...@@ -122,7 +122,7 @@ static my_bool read_charset_index(CS_ID ***charsets, myf myflags) ...@@ -122,7 +122,7 @@ static my_bool read_charset_index(CS_ID ***charsets, myf myflags)
fb.buf[0] = '\0'; fb.buf[0] = '\0';
fb.p = fb.buf; fb.p = fb.buf;
if (init_dynamic_array(&cs, sizeof(CS_ID *), 32, 32)) if (my_init_dynamic_array(&cs, sizeof(CS_ID *), 32, 32))
return TRUE; return TRUE;
while (!get_word(&fb, buf) && !get_word(&fb, num_buf)) while (!get_word(&fb, buf) && !get_word(&fb, num_buf))
...@@ -180,7 +180,7 @@ static my_bool init_available_charsets(myf myflags) ...@@ -180,7 +180,7 @@ static my_bool init_available_charsets(myf myflags)
pthread_mutex_lock(&THR_LOCK_charset); pthread_mutex_lock(&THR_LOCK_charset);
if (!cs_info_table.buffer) /* If not initialized */ if (!cs_info_table.buffer) /* If not initialized */
{ {
init_dynamic_array(&cs_info_table, sizeof(CHARSET_INFO*), 16, 8); my_init_dynamic_array(&cs_info_table, sizeof(CHARSET_INFO*), 16, 8);
error = read_charset_index(&available_charsets, myflags); error = read_charset_index(&available_charsets, myflags);
} }
charset_initialized=1; charset_initialized=1;
......
...@@ -123,7 +123,7 @@ void load_defaults(const char *conf_file, const char **groups, ...@@ -123,7 +123,7 @@ void load_defaults(const char *conf_file, const char **groups,
for (; *groups ; groups++) for (; *groups ; groups++)
group.count++; group.count++;
if (init_dynamic_array(&args, sizeof(char*),*argc, 32)) if (my_init_dynamic_array(&args, sizeof(char*),*argc, 32))
goto err; goto err;
if (forced_default_file) if (forced_default_file)
{ {
......
...@@ -44,7 +44,7 @@ my_bool _hash_init(HASH *hash,uint size,uint key_offset,uint key_length, ...@@ -44,7 +44,7 @@ my_bool _hash_init(HASH *hash,uint size,uint key_offset,uint key_length,
DBUG_PRINT("enter",("hash: %lx size: %d",hash,size)); DBUG_PRINT("enter",("hash: %lx size: %d",hash,size));
hash->records=0; hash->records=0;
if (init_dynamic_array_ci(&hash->array,sizeof(HASH_LINK),size,0)) if (my_init_dynamic_array_ci(&hash->array,sizeof(HASH_LINK),size,0))
{ {
hash->free=0; /* Allow call to hash_free */ hash->free=0; /* Allow call to hash_free */
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
......
...@@ -94,7 +94,7 @@ extern "C" { ...@@ -94,7 +94,7 @@ extern "C" {
void init_raid(void) void init_raid(void)
{ {
/* Allocate memory for global file to raid map */ /* Allocate memory for global file to raid map */
init_dynamic_array(&RaidFd::_raid_map, sizeof(RaidFd*), 4096, 1024); my_init_dynamic_array(&RaidFd::_raid_map, sizeof(RaidFd*), 4096, 1024);
} }
void end_raid(void) void end_raid(void)
{ {
......
...@@ -531,14 +531,14 @@ int MYSQL_LOG::purge_logs(THD* thd, const char* to_log) ...@@ -531,14 +531,14 @@ int MYSQL_LOG::purge_logs(THD* thd, const char* to_log)
error = LOG_INFO_MEM; error = LOG_INFO_MEM;
goto err; goto err;
} }
if (init_dynamic_array(&logs_to_purge, sizeof(char*), 1024, 1024)) if (my_init_dynamic_array(&logs_to_purge, sizeof(char*), 1024, 1024))
{ {
error = LOG_INFO_MEM; error = LOG_INFO_MEM;
goto err; goto err;
} }
logs_to_purge_inited = 1; logs_to_purge_inited = 1;
if (init_dynamic_array(&logs_to_keep, sizeof(char*), 1024, 1024)) if (my_init_dynamic_array(&logs_to_keep, sizeof(char*), 1024, 1024))
{ {
error = LOG_INFO_MEM; error = LOG_INFO_MEM;
goto err; goto err;
......
...@@ -514,7 +514,7 @@ void init_table_rule_hash(HASH* h, bool* h_inited) ...@@ -514,7 +514,7 @@ void init_table_rule_hash(HASH* h, bool* h_inited)
void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited) void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited)
{ {
init_dynamic_array(a, sizeof(TABLE_RULE_ENT*), TABLE_RULE_ARR_SIZE, my_init_dynamic_array(a, sizeof(TABLE_RULE_ENT*), TABLE_RULE_ARR_SIZE,
TABLE_RULE_ARR_SIZE); TABLE_RULE_ARR_SIZE);
*a_inited = 1; *a_inited = 1;
} }
......
...@@ -163,7 +163,7 @@ int acl_init(bool dont_read_acl_tables) ...@@ -163,7 +163,7 @@ int acl_init(bool dont_read_acl_tables)
init_sql_alloc(&mem,1024,0); init_sql_alloc(&mem,1024,0);
init_read_record(&read_record_info,thd,table= tables[0].table,NULL,1,0); init_read_record(&read_record_info,thd,table= tables[0].table,NULL,1,0);
VOID(init_dynamic_array(&acl_hosts,sizeof(ACL_HOST),20,50)); VOID(my_init_dynamic_array(&acl_hosts,sizeof(ACL_HOST),20,50));
while (!(read_record_info.read_record(&read_record_info))) while (!(read_record_info.read_record(&read_record_info)))
{ {
ACL_HOST host; ACL_HOST host;
...@@ -187,7 +187,7 @@ int acl_init(bool dont_read_acl_tables) ...@@ -187,7 +187,7 @@ int acl_init(bool dont_read_acl_tables)
freeze_size(&acl_hosts); freeze_size(&acl_hosts);
init_read_record(&read_record_info,thd,table=tables[1].table,NULL,1,0); init_read_record(&read_record_info,thd,table=tables[1].table,NULL,1,0);
VOID(init_dynamic_array(&acl_users,sizeof(ACL_USER),50,100)); VOID(my_init_dynamic_array(&acl_users,sizeof(ACL_USER),50,100));
if (table->field[2]->field_length == 8 && if (table->field[2]->field_length == 8 &&
protocol_version == PROTOCOL_VERSION) protocol_version == PROTOCOL_VERSION)
{ {
...@@ -273,7 +273,7 @@ int acl_init(bool dont_read_acl_tables) ...@@ -273,7 +273,7 @@ int acl_init(bool dont_read_acl_tables)
freeze_size(&acl_users); freeze_size(&acl_users);
init_read_record(&read_record_info,thd,table=tables[2].table,NULL,1,0); init_read_record(&read_record_info,thd,table=tables[2].table,NULL,1,0);
VOID(init_dynamic_array(&acl_dbs,sizeof(ACL_DB),50,100)); VOID(my_init_dynamic_array(&acl_dbs,sizeof(ACL_DB),50,100));
while (!(read_record_info.read_record(&read_record_info))) while (!(read_record_info.read_record(&read_record_info)))
{ {
ACL_DB db; ACL_DB db;
...@@ -846,7 +846,7 @@ int wild_case_compare(const char *str,const char *wildstr) ...@@ -846,7 +846,7 @@ int wild_case_compare(const char *str,const char *wildstr)
static void init_check_host(void) static void init_check_host(void)
{ {
DBUG_ENTER("init_check_host"); DBUG_ENTER("init_check_host");
VOID(init_dynamic_array(&acl_wild_hosts,sizeof(struct acl_host_and_ip), VOID(my_init_dynamic_array(&acl_wild_hosts,sizeof(struct acl_host_and_ip),
acl_users.elements,1)); acl_users.elements,1));
VOID(hash_init(&acl_check_hosts,acl_users.elements,0,0, VOID(hash_init(&acl_check_hosts,acl_users.elements,0,0,
(hash_get_key) check_get_key,0,HASH_CASE_INSENSITIVE)); (hash_get_key) check_get_key,0,HASH_CASE_INSENSITIVE));
......
...@@ -1610,7 +1610,7 @@ update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab, ...@@ -1610,7 +1610,7 @@ update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab,
join_tab[i].table->map); join_tab[i].table->map);
} }
} }
if (init_dynamic_array(keyuse,sizeof(KEYUSE),20,64)) if (my_init_dynamic_array(keyuse,sizeof(KEYUSE),20,64))
return TRUE; return TRUE;
/* fill keyuse with found key parts */ /* fill keyuse with found key parts */
for (KEY_FIELD *field=key_fields ; field != end ; field++) for (KEY_FIELD *field=key_fields ; field != end ; field++)
......
...@@ -55,7 +55,7 @@ Unique::Unique(qsort_cmp2 comp_func, void * comp_func_fixed_arg, ...@@ -55,7 +55,7 @@ Unique::Unique(qsort_cmp2 comp_func, void * comp_func_fixed_arg,
my_b_clear(&file); my_b_clear(&file);
init_tree(&tree, max_in_memory_size / 16, 0, size, comp_func, 0, NULL, comp_func_fixed_arg); init_tree(&tree, max_in_memory_size / 16, 0, size, comp_func, 0, NULL, comp_func_fixed_arg);
/* If the following fail's the next add will also fail */ /* If the following fail's the next add will also fail */
init_dynamic_array(&file_ptrs, sizeof(BUFFPEK), 16, 16); my_init_dynamic_array(&file_ptrs, sizeof(BUFFPEK), 16, 16);
max_elements= max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+size); max_elements= max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+size);
open_cached_file(&file, mysql_tmpdir,TEMP_PREFIX, DISK_BUFFER_SIZE, open_cached_file(&file, mysql_tmpdir,TEMP_PREFIX, DISK_BUFFER_SIZE,
MYF(MY_WME)); MYF(MY_WME));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment