Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
4249382a
Commit
4249382a
authored
May 04, 2011
by
Michael Widenius
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge
parents
10438588
718ddbb2
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
9 deletions
+22
-9
client/readline.cc
client/readline.cc
+1
-0
mysql-test/suite/innodb/t/innodb_bug60049.test
mysql-test/suite/innodb/t/innodb_bug60049.test
+6
-0
mysql-test/t/mysqldump.test
mysql-test/t/mysqldump.test
+4
-0
sql/log.cc
sql/log.cc
+1
-0
sql/mysql_priv.h
sql/mysql_priv.h
+8
-8
tests/mysql_client_test.c
tests/mysql_client_test.c
+2
-1
No files found.
client/readline.cc
View file @
4249382a
...
...
@@ -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
;
...
...
mysql-test/suite/innodb/t/innodb_bug60049.test
View file @
4249382a
...
...
@@ -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
;
...
...
mysql-test/t/mysqldump.test
View file @
4249382a
...
...
@@ -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
...
...
sql/log.cc
View file @
4249382a
...
...
@@ -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
;
...
...
sql/mysql_priv.h
View file @
4249382a
...
...
@@ -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
...
...
tests/mysql_client_test.c
View file @
4249382a
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment