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
b64d50ae
Commit
b64d50ae
authored
Feb 18, 2010
by
Bjorn Munch
Browse files
Options
Browse Files
Download
Plain Diff
upmerge 51135
parents
b471134b
65d64449
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
11 deletions
+28
-11
client/mysqltest.cc
client/mysqltest.cc
+21
-11
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+7
-0
No files found.
client/mysqltest.cc
View file @
b64d50ae
...
@@ -67,6 +67,7 @@
...
@@ -67,6 +67,7 @@
#define MAX_COLUMNS 256
#define MAX_COLUMNS 256
#define MAX_EMBEDDED_SERVER_ARGS 64
#define MAX_EMBEDDED_SERVER_ARGS 64
#define MAX_DELIMITER_LENGTH 16
#define MAX_DELIMITER_LENGTH 16
#define DEFAULT_MAX_CONN 128
/* Flags controlling send and reap */
/* Flags controlling send and reap */
#define QUERY_SEND_FLAG 1
#define QUERY_SEND_FLAG 1
...
@@ -79,8 +80,8 @@
...
@@ -79,8 +80,8 @@
enum
{
enum
{
OPT_SKIP_SAFEMALLOC
=
OPT_MAX_CLIENT_OPTION
,
OPT_SKIP_SAFEMALLOC
=
OPT_MAX_CLIENT_OPTION
,
OPT_PS_PROTOCOL
,
OPT_SP_PROTOCOL
,
OPT_CURSOR_PROTOCOL
,
OPT_VIEW_PROTOCOL
,
OPT_PS_PROTOCOL
,
OPT_SP_PROTOCOL
,
OPT_CURSOR_PROTOCOL
,
OPT_VIEW_PROTOCOL
,
OPT_MAX_CONNECT_RETRIES
,
OPT_MA
RK_PROGRESS
,
OPT_LOG_DIR
,
OPT_TAIL_LINE
S
,
OPT_MAX_CONNECT_RETRIES
,
OPT_MA
X_CONNECTIONS
,
OPT_MARK_PROGRES
S
,
OPT_
RESULT_FORMAT_VERSION
OPT_
LOG_DIR
,
OPT_TAIL_LINES
,
OPT_RESULT_FORMAT_VERSION
,
};
};
static
int
record
=
0
,
opt_sleep
=
-
1
;
static
int
record
=
0
,
opt_sleep
=
-
1
;
...
@@ -94,6 +95,7 @@ const char *opt_include= 0, *opt_charsets_dir;
...
@@ -94,6 +95,7 @@ const char *opt_include= 0, *opt_charsets_dir;
static
int
opt_port
=
0
;
static
int
opt_port
=
0
;
static
int
opt_max_connect_retries
;
static
int
opt_max_connect_retries
;
static
int
opt_result_format_version
;
static
int
opt_result_format_version
;
static
int
opt_max_connections
=
DEFAULT_MAX_CONN
;
static
my_bool
opt_compress
=
0
,
silent
=
0
,
verbose
=
0
;
static
my_bool
opt_compress
=
0
,
silent
=
0
,
verbose
=
0
;
static
my_bool
debug_info_flag
=
0
,
debug_check_flag
=
0
;
static
my_bool
debug_info_flag
=
0
,
debug_check_flag
=
0
;
static
my_bool
tty_password
=
0
;
static
my_bool
tty_password
=
0
;
...
@@ -247,7 +249,8 @@ struct st_connection
...
@@ -247,7 +249,8 @@ struct st_connection
int
query_done
;
int
query_done
;
#endif
/*EMBEDDED_LIBRARY*/
#endif
/*EMBEDDED_LIBRARY*/
};
};
struct
st_connection
connections
[
128
];
struct
st_connection
*
connections
=
NULL
;
struct
st_connection
*
cur_con
=
NULL
,
*
next_con
,
*
connections_end
;
struct
st_connection
*
cur_con
=
NULL
,
*
next_con
,
*
connections_end
;
/*
/*
...
@@ -1102,6 +1105,7 @@ void close_connections()
...
@@ -1102,6 +1105,7 @@ void close_connections()
mysql_close
(
next_con
->
util_mysql
);
mysql_close
(
next_con
->
util_mysql
);
my_free
(
next_con
->
name
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
next_con
->
name
,
MYF
(
MY_ALLOW_ZERO_PTR
));
}
}
my_free
(
connections
,
MYF
(
MY_WME
));
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
@@ -1142,7 +1146,8 @@ void free_used_memory()
...
@@ -1142,7 +1146,8 @@ void free_used_memory()
uint
i
;
uint
i
;
DBUG_ENTER
(
"free_used_memory"
);
DBUG_ENTER
(
"free_used_memory"
);
close_connections
();
if
(
connections
)
close_connections
();
close_files
();
close_files
();
my_hash_free
(
&
var_hash
);
my_hash_free
(
&
var_hash
);
...
@@ -5144,7 +5149,7 @@ void do_connect(struct st_command *command)
...
@@ -5144,7 +5149,7 @@ void do_connect(struct st_command *command)
{
{
if
(
!
(
con_slot
=
find_connection_by_name
(
"-closed_connection-"
)))
if
(
!
(
con_slot
=
find_connection_by_name
(
"-closed_connection-"
)))
die
(
"Connection limit exhausted, you can have max %d connections"
,
die
(
"Connection limit exhausted, you can have max %d connections"
,
(
int
)
(
sizeof
(
connections
)
/
sizeof
(
struct
st_connection
))
);
opt_max_connections
);
}
}
#ifdef EMBEDDED_LIBRARY
#ifdef EMBEDDED_LIBRARY
...
@@ -5915,6 +5920,10 @@ static struct my_option my_long_options[] =
...
@@ -5915,6 +5920,10 @@ static struct my_option my_long_options[] =
"Max number of connection attempts when connecting to server"
,
"Max number of connection attempts when connecting to server"
,
(
uchar
**
)
&
opt_max_connect_retries
,
(
uchar
**
)
&
opt_max_connect_retries
,
0
,
(
uchar
**
)
&
opt_max_connect_retries
,
(
uchar
**
)
&
opt_max_connect_retries
,
0
,
GET_INT
,
REQUIRED_ARG
,
500
,
1
,
10000
,
0
,
0
,
0
},
GET_INT
,
REQUIRED_ARG
,
500
,
1
,
10000
,
0
,
0
,
0
},
{
"max-connections"
,
OPT_MAX_CONNECTIONS
,
"Max number of open connections to server"
,
(
uchar
**
)
&
opt_max_connections
,
(
uchar
**
)
&
opt_max_connections
,
0
,
GET_INT
,
REQUIRED_ARG
,
128
,
8
,
5120
,
0
,
0
,
0
},
{
"password"
,
'p'
,
"Password to use when connecting to server."
,
{
"password"
,
'p'
,
"Password to use when connecting to server."
,
0
,
0
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
,
0
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"port"
,
'P'
,
"Port number to use for connection or 0 for default to, in "
{
"port"
,
'P'
,
"Port number to use for connection or 0 for default to, in "
...
@@ -7796,12 +7805,6 @@ int main(int argc, char **argv)
...
@@ -7796,12 +7805,6 @@ int main(int argc, char **argv)
/* Init expected errors */
/* Init expected errors */
memset
(
&
saved_expected_errors
,
0
,
sizeof
(
saved_expected_errors
));
memset
(
&
saved_expected_errors
,
0
,
sizeof
(
saved_expected_errors
));
/* Init connections */
memset
(
connections
,
0
,
sizeof
(
connections
));
connections_end
=
connections
+
(
sizeof
(
connections
)
/
sizeof
(
struct
st_connection
))
-
1
;
next_con
=
connections
+
1
;
#ifdef EMBEDDED_LIBRARY
#ifdef EMBEDDED_LIBRARY
/* set appropriate stack for the 'query' threads */
/* set appropriate stack for the 'query' threads */
(
void
)
pthread_attr_init
(
&
cn_thd_attrib
);
(
void
)
pthread_attr_init
(
&
cn_thd_attrib
);
...
@@ -7863,6 +7866,13 @@ int main(int argc, char **argv)
...
@@ -7863,6 +7866,13 @@ int main(int argc, char **argv)
verbose_msg
(
"Tracing progress in '%s'."
,
progress_file
.
file_name
());
verbose_msg
(
"Tracing progress in '%s'."
,
progress_file
.
file_name
());
}
}
/* Init connections, allocate 1 extra as buffer + 1 for default */
connections
=
(
struct
st_connection
*
)
my_malloc
((
opt_max_connections
+
2
)
*
sizeof
(
struct
st_connection
),
MYF
(
MY_WME
|
MY_ZEROFILL
));
connections_end
=
connections
+
opt_max_connections
+
1
;
next_con
=
connections
+
1
;
var_set_int
(
"$PS_PROTOCOL"
,
ps_protocol
);
var_set_int
(
"$PS_PROTOCOL"
,
ps_protocol
);
var_set_int
(
"$SP_PROTOCOL"
,
sp_protocol
);
var_set_int
(
"$SP_PROTOCOL"
,
sp_protocol
);
var_set_int
(
"$VIEW_PROTOCOL"
,
view_protocol
);
var_set_int
(
"$VIEW_PROTOCOL"
,
view_protocol
);
...
...
mysql-test/mysql-test-run.pl
View file @
b64d50ae
...
@@ -220,6 +220,7 @@ my $opt_skip_core;
...
@@ -220,6 +220,7 @@ my $opt_skip_core;
our
$opt_check_testcases
=
1
;
our
$opt_check_testcases
=
1
;
my
$opt_mark_progress
;
my
$opt_mark_progress
;
my
$opt_max_connections
;
my
$opt_sleep
;
my
$opt_sleep
;
...
@@ -940,6 +941,7 @@ sub command_line_setup {
...
@@ -940,6 +941,7 @@ sub command_line_setup {
'
warnings!
'
=>
\
$opt_warnings
,
'
warnings!
'
=>
\
$opt_warnings
,
'
timestamp
'
=>
\&
report_option
,
'
timestamp
'
=>
\&
report_option
,
'
timediff
'
=>
\&
report_option
,
'
timediff
'
=>
\&
report_option
,
'
max-connections=i
'
=>
\
$opt_max_connections
,
'
help|h
'
=>
\
$opt_usage
,
'
help|h
'
=>
\
$opt_usage
,
'
list-options
'
=>
\
$opt_list_options
,
'
list-options
'
=>
\
$opt_list_options
,
...
@@ -4975,6 +4977,10 @@ sub start_mysqltest ($) {
...
@@ -4975,6 +4977,10 @@ sub start_mysqltest ($) {
mtr_add_arg
(
$args
,
"
--ssl
");
mtr_add_arg
(
$args
,
"
--ssl
");
}
}
if
(
$opt_max_connections
)
{
mtr_add_arg
(
$args
,
"
--max-connections=%d
",
$opt_max_connections
);
}
if
(
$opt_embedded_server
)
if
(
$opt_embedded_server
)
{
{
...
@@ -5533,6 +5539,7 @@ Misc options
...
@@ -5533,6 +5539,7 @@ Misc options
timestamp Print timestamp before each test report line
timestamp Print timestamp before each test report line
timediff With --timestamp, also print time passed since
timediff With --timestamp, also print time passed since
*previous* test started
*previous* test started
max-connections=N Max number of open connection to server in mysqltest
HERE
HERE
exit
(
1
);
exit
(
1
);
...
...
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