diff options
| author | unknown <serg@serg.mysql.com> | 2002-04-28 21:27:21 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-04-28 21:27:21 +0000 |
| commit | c4016459fa9aa6eced5b48392f3744eaa3fab4c6 (patch) | |
| tree | df2243b05953bf7ef0afc57192f32a4f1292fe56 /include | |
| parent | 63686ef52e9fc12cf95721d803edd5de837acc99 (diff) | |
| parent | 7abf67c5e966f6409b13774ef9297ffc7d5ae17f (diff) | |
| download | mariadb-git-c4016459fa9aa6eced5b48392f3744eaa3fab4c6.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
sql/slave.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 175f7a86789..3ff35763bce 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -651,9 +651,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); |