mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysqldev@production.mysql.com:my/mysql-5.0-build

Browse source 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
This commit is contained in:
unknown 2005-04-11 17:20:29 +04:00
commit 0ff8a1f518
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
server-tools/instance-manager/commands.cc
View file

@ -294,13 +294,19 @@ int Show_instance_options::do_command(struct st_net *net,
char *tmp_option, *option_value; char *tmp_option, *option_value;
get_dynamic(&(instance->options.options_array), (gptr) &tmp_option, i); get_dynamic(&(instance->options.options_array), (gptr) &tmp_option, i);
option_value= strchr(tmp_option, '='); option_value= strchr(tmp_option, '=');
/* split the option string into two parts */ /* split the option string into two parts if it has a value */
*option_value= 0;
position= 0; position= 0;
store_to_string(&send_buff, tmp_option + 2, &position); if (option_value != NULL)
store_to_string(&send_buff, option_value + 1, &position); {
/* join name and the value into the same option again */ *option_value= 0;
*option_value= '='; store_to_string(&send_buff, tmp_option + 2, &position);
store_to_string(&send_buff, option_value + 1, &position);
/* join name and the value into the same option again */
*option_value= '=';
}
else store_to_string(&send_buff, tmp_option + 2, &position);
if (send_buff.is_error() || if (send_buff.is_error() ||
my_net_write(net, send_buff.buffer, (uint) position)) my_net_write(net, send_buff.buffer, (uint) position))
goto err; goto err;

4
server-tools/instance-manager/instance.cc
View file

@ -191,8 +191,8 @@ bool Instance::is_running()
MYSQL mysql; MYSQL mysql;
uint port= 0; uint port= 0;
const char *socket= NULL; const char *socket= NULL;
const char *password= "321rarepassword213"; const char *password= "check_connection";
const char *username= "645rareusername945"; const char *username= "MySQL_Instance_Manager";
const char *access_denied_message= "Access denied for user"; const char *access_denied_message= "Access denied for user";
bool return_val; bool return_val;

2
server-tools/instance-manager/options.cc
View file

@ -130,7 +130,7 @@ static void version()
} }
static const char *default_groups[]= { "mysql", "manager", 0 }; static const char *default_groups[]= { "manager", 0 };
static void usage() static void usage()