mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic merge

Browse source
This commit is contained in:
Michael Widenius 2011-05-04 22:33:18 +03:00
commit 4249382a65
6 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/readline.cc
View file

@ -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;

6
mysql-test/suite/innodb/t/innodb_bug60049.test
View file

@ -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;

4
mysql-test/t/mysqldump.test
View file

@ -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

1
sql/log.cc
View file

@ -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;

16
sql/mysql_priv.h
View file

@ -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

3
tests/mysql_client_test.c
View file

@ -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);