From d54f869f8c34e5bb93ab187cfc6495f9e192c259 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Tue, 30 Nov 2010 01:14:34 +0200 Subject: Fixed some compiler warnings configure.in: Added comment mysql-test/suite/innodb_plugin/t/innodb_bug56680.test: Disable test when run with valgrind as we get errors from buf_buddy_relocate() on work for this test. (Should probably be investigated as this may be an issue in xtradb, but probably harmless) Work is an amd-64 running openSUSE 1.11 and valgrind 3.4.1 mysys/charset.c: Remove static function if not used (to remove compiler warning) storage/xtradb/srv/srv0srv.c: Added casts to get rid of compiler warnings --- mysys/charset.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mysys/charset.c') diff --git a/mysys/charset.c b/mysys/charset.c index 8d2f68b7bbf..f751e59de82 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -202,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(CHARSET_INFO *to, CHARSET_INFO *from) { @@ -215,6 +216,7 @@ copy_uca_collation(CHARSET_INFO *to, CHARSET_INFO *from) to->state|= MY_CS_AVAILABLE | MY_CS_LOADED | MY_CS_STRNXFRM | MY_CS_UNICODE; } +#endif static int add_collation(CHARSET_INFO *cs) -- cgit v1.2.1 From 1177bea2f1cd0c9f887670b65c9a403a26f07d76 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 May 2011 16:27:19 +0300 Subject: Rewritten patch of percona - switching query cache on and off, removing comments. client/mysqltest.cc: Column names. mysql-test/r/grant_cache_no_prot.result: fix of text. mysql-test/r/grant_cache_ps_prot.result: Fix of test. mysql-test/r/query_cache.result: Switching on and off query cache. mysql-test/t/query_cache.test: Switching on and off query cache. mysys/charset.c: Fix of parser. sql/handler.cc: thd added to parameters. sql/log_event.cc: thd added to parameters. sql/log_event_old.cc: thd added to parameters. sql/mysql_priv.h: Fixed functions definitions. sql/mysqld.cc: Comments stripping. sql/set_var.cc: Switching on and off query cache. sql/set_var.h: Switching on and off query cache. sql/share/errmsg.txt: New errors. sql/sql_cache.cc: Switching query cache on and off, removing comments. sql/sql_cache.h: thd added to parameters. sql/sql_class.h: Comments stripping. sql/sql_db.cc: thd added to parameters. sql/sql_lex.cc: lex fixed. sql/sql_parse.cc: thd added to parameters. --- mysys/charset.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mysys/charset.c') diff --git a/mysys/charset.c b/mysys/charset.c index 7b72f1f5ae3..c7756583b19 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 -- cgit v1.2.1