diff options
| author | serg@sergbook.mysql.com <> | 2007-04-16 10:37:50 +0200 |
|---|---|---|
| committer | serg@sergbook.mysql.com <> | 2007-04-16 10:37:50 +0200 |
| commit | 6bc9bc92df57f1cc586e2223e23c0e94003fa7eb (patch) | |
| tree | df4c92bcf5668ec88685604378ad6dc60bfcf269 /include/my_sys.h | |
| parent | 3f72507d0d9e935b0a6badcf20c0dbff06860658 (diff) | |
| parent | c53037af36e1e7af2996299fc6f0d126619f2565 (diff) | |
| download | mariadb-git-6bc9bc92df57f1cc586e2223e23c0e94003fa7eb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index cff8c73c9ff..691233b9839 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -759,8 +759,15 @@ 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 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) +#define my_init_dynamic_array(A,B,C,D) init_dynamic_array2(A,B,NULL,C,D CALLER_INFO) +#define my_init_dynamic_array_ci(A,B,C,D) init_dynamic_array2(A,B,NULL,C,D ORIG_CALLER_INFO) +#define my_init_dynamic_array2(A,B,C,D,E) init_dynamic_array2(A,B,C,D,E CALLER_INFO) +#define my_init_dynamic_array2_ci(A,B,C,D,E) init_dynamic_array2(A,B,C,D,E ORIG_CALLER_INFO) +extern my_bool init_dynamic_array2(DYNAMIC_ARRAY *array,uint element_size, + void *init_buffer, uint init_alloc, + uint alloc_increment + CALLER_INFO_PROTO); +/* init_dynamic_array() function is deprecated */ extern my_bool init_dynamic_array(DYNAMIC_ARRAY *array,uint element_size, uint init_alloc,uint alloc_increment CALLER_INFO_PROTO); |