mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged
This commit is contained in:
commit
bcae429e91
1 changed files with 5 additions and 0 deletions
|
@ -6040,6 +6040,11 @@ int main(int argc, char **argv)
|
||||||
init_dynamic_string(&ds_warning_messages, "", 0, 2048);
|
init_dynamic_string(&ds_warning_messages, "", 0, 2048);
|
||||||
parse_args(argc, argv);
|
parse_args(argc, argv);
|
||||||
|
|
||||||
|
var_set_int("$PS_PROTOCOL", ps_protocol);
|
||||||
|
var_set_int("$SP_PROTOCOL", sp_protocol);
|
||||||
|
var_set_int("$VIEW_PROTOCOL", view_protocol);
|
||||||
|
var_set_int("$CURSOR_PROTOCOL", cursor_protocol);
|
||||||
|
|
||||||
DBUG_PRINT("info",("result_file: '%s'",
|
DBUG_PRINT("info",("result_file: '%s'",
|
||||||
result_file_name ? result_file_name : ""));
|
result_file_name ? result_file_name : ""));
|
||||||
if (mysql_server_init(embedded_server_arg_count,
|
if (mysql_server_init(embedded_server_arg_count,
|
||||||
|
|
Loading…
Reference in a new issue