diff --git a/client/readline.cc b/client/readline.cc index 946cb582977..4edccebef39 100644 --- a/client/readline.cc +++ b/client/readline.cc @@ -56,6 +56,7 @@ char *batch_readline(LINE_BUFFER *line_buff) { char *pos; ulong out_length; + LINT_INIT(out_length); if (!(pos=intern_read_line(line_buff, &out_length))) return 0; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 24b83e96361..fd695373e87 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1701,7 +1701,7 @@ sub collect_mysqld_features { my $args; mtr_init_args(\$args); mtr_add_arg($args, "--no-defaults"); - mtr_add_arg($args, "--datadir=%s/tmp", $opt_vardir); + mtr_add_arg($args, "--datadir=."); mtr_add_arg($args, "--basedir=%s", $basedir); mtr_add_arg($args, "--language=%s", $path_language); mtr_add_arg($args, "--skip-grant-tables"); diff --git a/mysql-test/suite/innodb/t/innodb_bug60049.test b/mysql-test/suite/innodb/t/innodb_bug60049.test index ec4e3b8de7e..1110f619862 100644 --- a/mysql-test/suite/innodb/t/innodb_bug60049.test +++ b/mysql-test/suite/innodb/t/innodb_bug60049.test @@ -5,6 +5,12 @@ -- source include/not_embedded.inc -- source include/have_innodb.inc +if (`SELECT @@innodb_fast_shutdown != 0`) + +{ + skip Need innodb_fast_shutdown=0; +} + CREATE TABLE t(a INT)ENGINE=InnoDB; RENAME TABLE t TO u; DROP TABLE u; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 00d9339fcf4..99537618011 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -6,6 +6,10 @@ call mtr.add_suppression("@003f.frm' \\(errno: 22\\)"); # Binlog is required --source include/have_log_bin.inc +# utf8 is required +let collation=utf8_unicode_ci; +--source include/have_collation.inc + # Save the initial number of concurrent sessions --source include/count_sessions.inc diff --git a/sql/log.cc b/sql/log.cc index becddf7bfdc..5213bdcc937 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1920,6 +1920,7 @@ static int find_uniq_filename(char *name) size_t buf_length, length; char *start, *end; DBUG_ENTER("find_uniq_filename"); + LINT_INIT(number); length= dirname_part(buff, name, &buf_length); start= name + length; diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 6f97c7359c2..b084a8b5264 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -922,14 +922,14 @@ struct Query_cache_query_flags (((L)->sql_command == SQLCOM_SELECT) && (L)->safe_to_cache_query) #else #define QUERY_CACHE_FLAGS_SIZE 0 -#define query_cache_store_query(A, B) -#define query_cache_destroy() -#define query_cache_result_size_limit(A) -#define query_cache_init() -#define query_cache_resize(A) -#define query_cache_set_min_res_unit(A) -#define query_cache_invalidate3(A, B, C) -#define query_cache_invalidate1(A) +#define query_cache_store_query(A, B) do { } while(0) +#define query_cache_destroy() do { } while(0) +#define query_cache_result_size_limit(A) do { } while(0) +#define query_cache_init() do { } while(0) +#define query_cache_resize(A) do { } while(0) +#define query_cache_set_min_res_unit(A) do { } while(0) +#define query_cache_invalidate3(A, B, C) do { } while(0) +#define query_cache_invalidate1(A) do { } while(0) #define query_cache_send_result_to_client(A, B, C) 0 #define query_cache_invalidate_by_MyISAM_filename_ref NULL diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 9f87ee2abcd..c6efdca60f6 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -18467,7 +18467,8 @@ static void test_bug58036() if (!opt_silent) printf("Got mysql_real_connect() error (expected): %s (%d)\n", mysql_error(conn), mysql_errno(conn)); - DIE_UNLESS(mysql_errno(conn) == ER_WRONG_VALUE_FOR_VAR); + DIE_UNLESS(mysql_errno(conn) == ER_WRONG_VALUE_FOR_VAR || + mysql_errno(conn)== CR_CANT_READ_CHARSET); mysql_close(conn);