diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 19:28:26 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 19:28:26 +0200 |
| commit | ce07d09fd3eb1abbfe3c2ff75a78ef4eacf34bd7 (patch) | |
| tree | 006fe23182bd63ca669c55ef7f52b6374e7c0df2 /include | |
| parent | de76cbdcb0728b80c0f7b453b24b0b81f653e450 (diff) | |
| parent | 622466644dda1e3c72f5fe276e3a8127b20c1182 (diff) | |
| download | mariadb-git-ce07d09fd3eb1abbfe3c2ff75a78ef4eacf34bd7.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/ma_dyncol.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/ma_dyncol.h b/include/ma_dyncol.h index cb03ccb5382..300474e061e 100644 --- a/include/ma_dyncol.h +++ b/include/ma_dyncol.h @@ -63,6 +63,12 @@ typedef struct st_mysql_lex_string LEX_STRING; /* NO and OK is the same used just to show semantics */ #define ER_DYNCOL_NO ER_DYNCOL_OK +#ifdef HAVE_CHARSET_utf8mb4 +#define DYNCOL_UTF (&my_charset_utf8mb4_general_ci) +#else +#define DYNCOL_UTF (&my_charset_utf8_general_ci) +#endif + enum enum_dyncol_func_result { ER_DYNCOL_OK= 0, |