diff options
| author | unknown <andrey@lmy004.> | 2006-01-10 21:02:19 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-01-10 21:02:19 +0100 |
| commit | bb0b7f5dda0933e60cd9520d172fd27a9724cdb6 (patch) | |
| tree | ed7905772f33cdc3e24dd8fbfa8894d09ed4ec0a /include/my_sys.h | |
| parent | 12c8b61aad80d04c99d77ef2a92fc26393b4f68d (diff) | |
| parent | 1ef97f1f3b3dc53a5945fb4fc7db6a3fea926379 (diff) | |
| download | mariadb-git-bb0b7f5dda0933e60cd9520d172fd27a9724cdb6.tar.gz | |
WL #1034 (Internal CRON)
merge before push
BUILD/SETUP.sh:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp.h:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/tztime.cc:
Auto merged
libmysqld/Makefile.am:
manual merge
mysql-test/r/information_schema.result:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sp_head.cc:
manual merge
sql/sql_lex.h:
manual merge
sql/sql_yacc.yy:
manual merge
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 39810e61de3..dc2a2c63379 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -753,6 +753,7 @@ extern void get_dynamic(DYNAMIC_ARRAY *array,gptr element,uint array_index); extern void delete_dynamic(DYNAMIC_ARRAY *array); extern void delete_dynamic_element(DYNAMIC_ARRAY *array, uint array_index); extern void freeze_size(DYNAMIC_ARRAY *array); +extern int get_index_dynamic(DYNAMIC_ARRAY *array, gptr element); #define dynamic_array_ptr(array,array_index) ((array)->buffer+(array_index)*(array)->size_of_element) #define dynamic_element(array,array_index,type) ((type)((array)->buffer) +(array_index)) #define push_dynamic(A,B) insert_dynamic((A),(B)) |