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
ace6f142
Commit
ace6f142
authored
Feb 17, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug#17382 mysql-test-run mysqldump fails with mysqlimport: Error:client run out of memory
- Disable --use-threads option in 5.1.7
parent
088bc804
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
30 deletions
+4
-30
client/mysqlimport.c
client/mysqlimport.c
+2
-0
mysql-test/r/mysqldump.result
mysql-test/r/mysqldump.result
+0
-30
mysql-test/t/mysqldump.test
mysql-test/t/mysqldump.test
+2
-0
No files found.
client/mysqlimport.c
View file @
ace6f142
...
@@ -146,11 +146,13 @@ static struct my_option my_long_options[] =
...
@@ -146,11 +146,13 @@ static struct my_option my_long_options[] =
(
gptr
*
)
&
opt_mysql_unix_port
,
(
gptr
*
)
&
opt_mysql_unix_port
,
0
,
GET_STR
,
(
gptr
*
)
&
opt_mysql_unix_port
,
(
gptr
*
)
&
opt_mysql_unix_port
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#include <sslopt-longopts.h>
#include <sslopt-longopts.h>
#if 0
{"use-threads", OPT_USE_THREADS,
{"use-threads", OPT_USE_THREADS,
"Load files in parallel. The argument is the number "
"Load files in parallel. The argument is the number "
"of threads to use for loading data.",
"of threads to use for loading data.",
(gptr*) &opt_use_threads, (gptr*) &opt_use_threads, 0,
(gptr*) &opt_use_threads, (gptr*) &opt_use_threads, 0,
GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
#ifndef DONT_ALLOW_USER_CHANGE
#ifndef DONT_ALLOW_USER_CHANGE
{
"user"
,
'u'
,
"User for login if not current user."
,
(
gptr
*
)
&
current_user
,
{
"user"
,
'u'
,
"User for login if not current user."
,
(
gptr
*
)
&
current_user
,
(
gptr
*
)
&
current_user
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
(
gptr
*
)
&
current_user
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
...
...
mysql-test/r/mysqldump.result
View file @
ace6f142
...
@@ -2650,33 +2650,3 @@ DELIMITER ;
...
@@ -2650,33 +2650,3 @@ DELIMITER ;
DROP TRIGGER tr1;
DROP TRIGGER tr1;
DROP TABLE t1;
DROP TABLE t1;
create table t1 (a text , b text);
create table t2 (a text , b text);
insert t1 values ("Duck, Duck", "goose");
insert t1 values ("Duck, Duck", "pidgeon");
insert t2 values ("We the people", "in order to perform");
insert t2 values ("a more perfect", "union");
select * from t1;
a b
Duck, Duck goose
Duck, Duck pidgeon
select * from t2;
a b
We the people in order to perform
a more perfect union
test.t1: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0
test.t2: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0
select * from t1;
a b
Duck, Duck goose
Duck, Duck pidgeon
Duck, Duck goose
Duck, Duck pidgeon
select * from t2;
a b
We the people in order to perform
a more perfect union
We the people in order to perform
a more perfect union
drop table t1;
drop table t2;
mysql-test/t/mysqldump.test
View file @
ace6f142
...
@@ -1049,6 +1049,7 @@ SET SQL_MODE = @old_sql_mode;
...
@@ -1049,6 +1049,7 @@ SET SQL_MODE = @old_sql_mode;
DROP
TRIGGER
tr1
;
DROP
TRIGGER
tr1
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
--
disable_parsing
#
#
# Added for use-thread option
# Added for use-thread option
#
#
...
@@ -1072,3 +1073,4 @@ select * from t2;
...
@@ -1072,3 +1073,4 @@ select * from t2;
drop
table
t1
;
drop
table
t1
;
drop
table
t2
;
drop
table
t2
;
--
enable_parsing
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