diff options
| author | serg@serg.mysql.com <> | 2002-04-28 21:22:37 +0000 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2002-04-28 21:22:37 +0000 |
| commit | 900788b2a1e9a75fa4427ea4c437561e2467792c (patch) | |
| tree | 5d37a8e2b57f196aff164e8f9f9a596013cc65e5 /mysys | |
| parent | e2f1993a1dfa45ae108c1424acb07dc6c30d8beb (diff) | |
| download | mariadb-git-900788b2a1e9a75fa4427ea4c437561e2467792c.tar.gz | |
init_dynamic_array MyODBC compatibility fix
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/array.c | 2 | ||||
| -rw-r--r-- | mysys/charset.c | 4 | ||||
| -rw-r--r-- | mysys/default.c | 2 | ||||
| -rw-r--r-- | mysys/hash.c | 2 | ||||
| -rw-r--r-- | mysys/raid.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/mysys/array.c b/mysys/array.c index 2420213d454..2a0723fbd69 100644 --- a/mysys/array.c +++ b/mysys/array.c @@ -28,7 +28,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) { diff --git a/mysys/charset.c b/mysys/charset.c index 93e8b697904..1001b76f417 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -122,7 +122,7 @@ static my_bool read_charset_index(CS_ID ***charsets, myf myflags) fb.buf[0] = '\0'; 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; while (!get_word(&fb, buf) && !get_word(&fb, num_buf)) @@ -180,7 +180,7 @@ static my_bool init_available_charsets(myf myflags) pthread_mutex_lock(&THR_LOCK_charset); 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); } charset_initialized=1; diff --git a/mysys/default.c b/mysys/default.c index d3c1b3815eb..12d7d2e4ed0 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -123,7 +123,7 @@ void load_defaults(const char *conf_file, const char **groups, for (; *groups ; groups++) group.count++; - if (init_dynamic_array(&args, sizeof(char*),*argc, 32)) + if (my_init_dynamic_array(&args, sizeof(char*),*argc, 32)) goto err; if (forced_default_file) { diff --git a/mysys/hash.c b/mysys/hash.c index b3769d1dfb2..eaea6d7503f 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -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)); 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 */ DBUG_RETURN(TRUE); diff --git a/mysys/raid.cc b/mysys/raid.cc index 72d3b2074be..6196e1f1aa6 100644 --- a/mysys/raid.cc +++ b/mysys/raid.cc @@ -94,7 +94,7 @@ extern "C" { void init_raid(void) { /* 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) { |