diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysys/charset.c | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index f859ceae394..98b87ba9feb 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -97,6 +97,9 @@ static my_bool init_state_maps(struct charset_info_st *cs) state_map[(uchar)'@']= (uchar) MY_LEX_USER_END; state_map[(uchar) '`']= (uchar) MY_LEX_USER_VARIABLE_DELIMITER; state_map[(uchar)'"']= (uchar) MY_LEX_STRING_OR_DELIMITER; + state_map[(uchar)'-']= (uchar) MY_LEX_MINUS_OR_COMMENT; + state_map[(uchar)',']= (uchar) MY_LEX_COMMA; + state_map[(uchar)'?']= (uchar) MY_LEX_PLACEHOLDER; /* Create a second map to make it faster to find identifiers @@ -199,6 +202,7 @@ static my_bool simple_cs_is_full(CHARSET_INFO *cs) } +#if defined(HAVE_UCA_COLLATIONS) && (defined(HAVE_CHARSET_ucs2) || defined(HAVE_CHARSET_utf8)) static void copy_uca_collation(struct charset_info_st *to, CHARSET_INFO *from) { @@ -212,6 +216,7 @@ copy_uca_collation(struct charset_info_st *to, CHARSET_INFO *from) to->state|= MY_CS_AVAILABLE | MY_CS_LOADED | MY_CS_STRNXFRM | MY_CS_UNICODE; } +#endif static int add_collation(struct charset_info_st *cs) |