Commit 3c9ae014 authored by Michael Widenius's avatar Michael Widenius

Fixed build errors on centos5-amd64-minimal, where we compile with very few character sets

Fixed compiler warnings

client/readline.cc:
  Fixed compiler warning
mysql-test/t/mysqldump.test:
  Only run test if utf8 is used
sql/log.cc:
  Fixed compiler warning
sql/mysql_priv.h:
  Fixed compiler warnings
tests/mysql_client_test.c:
  Don't abort test if ucs2 is not in use.
parent ca67f01b
...@@ -56,6 +56,7 @@ char *batch_readline(LINE_BUFFER *line_buff) ...@@ -56,6 +56,7 @@ char *batch_readline(LINE_BUFFER *line_buff)
{ {
char *pos; char *pos;
ulong out_length; ulong out_length;
LINT_INIT(out_length);
if (!(pos=intern_read_line(line_buff, &out_length))) if (!(pos=intern_read_line(line_buff, &out_length)))
return 0; return 0;
......
...@@ -6,6 +6,10 @@ call mtr.add_suppression("@003f.frm' \\(errno: 22\\)"); ...@@ -6,6 +6,10 @@ call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");
# Binlog is required # Binlog is required
--source include/have_log_bin.inc --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 # Save the initial number of concurrent sessions
--source include/count_sessions.inc --source include/count_sessions.inc
......
...@@ -1877,6 +1877,7 @@ static int find_uniq_filename(char *name) ...@@ -1877,6 +1877,7 @@ static int find_uniq_filename(char *name)
size_t buf_length, length; size_t buf_length, length;
char *start, *end; char *start, *end;
DBUG_ENTER("find_uniq_filename"); DBUG_ENTER("find_uniq_filename");
LINT_INIT(number);
length= dirname_part(buff, name, &buf_length); length= dirname_part(buff, name, &buf_length);
start= name + length; start= name + length;
......
...@@ -909,14 +909,14 @@ struct Query_cache_query_flags ...@@ -909,14 +909,14 @@ struct Query_cache_query_flags
(((L)->sql_command == SQLCOM_SELECT) && (L)->safe_to_cache_query) (((L)->sql_command == SQLCOM_SELECT) && (L)->safe_to_cache_query)
#else #else
#define QUERY_CACHE_FLAGS_SIZE 0 #define QUERY_CACHE_FLAGS_SIZE 0
#define query_cache_store_query(A, B) #define query_cache_store_query(A, B) do { } while(0)
#define query_cache_destroy() #define query_cache_destroy() do { } while(0)
#define query_cache_result_size_limit(A) #define query_cache_result_size_limit(A) do { } while(0)
#define query_cache_init() #define query_cache_init() do { } while(0)
#define query_cache_resize(A) #define query_cache_resize(A) do { } while(0)
#define query_cache_set_min_res_unit(A) #define query_cache_set_min_res_unit(A) do { } while(0)
#define query_cache_invalidate3(A, B, C) #define query_cache_invalidate3(A, B, C) do { } while(0)
#define query_cache_invalidate1(A) #define query_cache_invalidate1(A) do { } while(0)
#define query_cache_send_result_to_client(A, B, C) 0 #define query_cache_send_result_to_client(A, B, C) 0
#define query_cache_invalidate_by_MyISAM_filename_ref NULL #define query_cache_invalidate_by_MyISAM_filename_ref NULL
......
...@@ -18466,7 +18466,8 @@ static void test_bug58036() ...@@ -18466,7 +18466,8 @@ static void test_bug58036()
if (!opt_silent) if (!opt_silent)
printf("Got mysql_real_connect() error (expected): %s (%d)\n", printf("Got mysql_real_connect() error (expected): %s (%d)\n",
mysql_error(conn), mysql_errno(conn)); 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); mysql_close(conn);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment