diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-09 19:31:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-09 19:31:29 +0200 |
| commit | 42f56557f59705aeec83a54f02399b04d52e9eea (patch) | |
| tree | 69db851f78adb21b42f9898f501934f669d64a91 /mysys/ma_dyncol.c | |
| parent | 92265da9d77bc750eb234cfac9d6239675078983 (diff) | |
| download | mariadb-git-42f56557f59705aeec83a54f02399b04d52e9eea.tar.gz | |
MDEV-4941 make: AIX fails with 'Identifier not allowed in cast'; syntax error in include/my_global.h
C++ comments in C files, and a typo in my_global.h
Diffstat (limited to 'mysys/ma_dyncol.c')
| -rw-r--r-- | mysys/ma_dyncol.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c index 88730f9dc4f..62227ab6834 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -1385,7 +1385,8 @@ static inline my_bool read_fixed_header(DYNAMIC_COLUMN *str, @return ER_DYNCOL_* return code */ -int dynamic_column_get(DYNAMIC_COLUMN *str, uint column_nr, +enum enum_dyncol_func_result +dynamic_column_get(DYNAMIC_COLUMN *str, uint column_nr, DYNAMIC_COLUMN_VALUE *store_it_here) { uchar *data; @@ -1457,7 +1458,8 @@ err: @return ER_DYNCOL_* return code */ -int dynamic_column_delete(DYNAMIC_COLUMN *str, uint column_nr) +enum enum_dyncol_func_result +dynamic_column_delete(DYNAMIC_COLUMN *str, uint column_nr) { uchar *data, *header_entry, *read, *write; size_t offset_size, new_offset_size, length, entry_size, new_entry_size, @@ -2111,7 +2113,8 @@ create_new_string: */ -int dynamic_column_update(DYNAMIC_COLUMN *str, uint column_nr, +enum enum_dyncol_func_result +dynamic_column_update(DYNAMIC_COLUMN *str, uint column_nr, DYNAMIC_COLUMN_VALUE *value) { return dynamic_column_update_many(str, 1, &column_nr, value); |