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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
9c1e2bbc
Commit
9c1e2bbc
authored
15 years ago
by
Alexey Kopytov
Browse files
Options
Browse Files
Download
Plain Diff
Automerge.
parents
9a49934a
08410f34
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
1 deletion
+52
-1
client/mysql.cc
client/mysql.cc
+1
-1
mysql-test/r/mysql-bug45236.result
mysql-test/r/mysql-bug45236.result
+8
-0
mysql-test/t/mysql-bug45236.test
mysql-test/t/mysql-bug45236.test
+43
-0
No files found.
client/mysql.cc
View file @
9c1e2bbc
...
...
@@ -112,7 +112,7 @@ extern "C" {
#define PROMPT_CHAR '\\'
#define DEFAULT_DELIMITER ";"
#define MAX_BATCH_BUFFER_SIZE (1024L * 1024L)
#define MAX_BATCH_BUFFER_SIZE (1024L * 1024L
* 1024L
)
typedef
struct
st_status
{
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/mysql-bug45236.result
0 → 100644
View file @
9c1e2bbc
DROP TABLE IF EXISTS t1;
SET @old_max_allowed_packet= @@global.max_allowed_packet;
SET @@global.max_allowed_packet = 1024 * 1024 + 1024;
CREATE TABLE t1(data LONGBLOB);
INSERT INTO t1 SELECT CONCAT(REPEAT('1', 1024*1024 - 27),
"\'\r dummydb dummyhost");
DROP TABLE t1;
SET @@global.max_allowed_packet = @old_max_allowed_packet;
This diff is collapsed.
Click to expand it.
mysql-test/t/mysql-bug45236.test
0 → 100644
View file @
9c1e2bbc
#
# Bug #45236: large blob inserts from mysqldump fail, possible memory issue ?
#
# This test consumes a significant amount of resources.
# Therefore it should be kept separated from other tests.
# Otherwise we might suffer from problems like
# Bug#43801 mysql.test takes too long, fails due to expired timeout
# on debx86-b in PB
#
--
disable_warnings
DROP
TABLE
IF
EXISTS
t1
;
--
enable_warnings
# Have to change the global variable as the session variable is
# read-only.
SET
@
old_max_allowed_packet
=
@@
global
.
max_allowed_packet
;
# ~1 MB blob length + some space for the rest of INSERT query
SET
@@
global
.
max_allowed_packet
=
1024
*
1024
+
1024
;
# Create a new connection since the global max_allowed_packet
# has no effect onr the current one
connect
(
con1
,
localhost
,
root
,,);
CREATE
TABLE
t1
(
data
LONGBLOB
);
INSERT
INTO
t1
SELECT
CONCAT
(
REPEAT
(
'1'
,
1024
*
1024
-
27
),
"\'
\r
dummydb dummyhost"
);
let
$outfile
=
$MYSQLTEST_VARDIR
/
tmp
/
bug41486
.
sql
;
--
error
0
,
1
remove_file
$outfile
;
--
exec
$MYSQL_DUMP
--
compact
-
t
test
t1
>
$outfile
# Check that the mysql client does not interpret the "\r" sequence as a command
--
exec
$MYSQL
--
max_allowed_packet
=
1
M
test
<
$outfile
2
>&
1
DROP
TABLE
t1
;
# Cleanup
disconnect
con1
;
--
source
include
/
wait_until_disconnected
.
inc
remove_file
$outfile
;
connection
default
;
SET
@@
global
.
max_allowed_packet
=
@
old_max_allowed_packet
;
This diff is collapsed.
Click to expand it.
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