database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

fixes in mysqltest and mysqlbinlog

Browse Source 
trying to understand why --bootstrap option does not create tables
on disk, hope the problem will be fixed when I pull, if not will
debug, but need to commit in order to pull


client/mysqltest.c:
  added safe_connect() and chaned all calls to mysql_real_connect() to
  safe_connect()
mysql-test/install_test_db.sh:
  more diagnostic
sql/log_event.cc:
  fixed compile error in mysqlbinlog
This commit is contained in:
unknown
2001-08-20 11:20:47 -06:00
parent e704dd7202
commit 9326aa42ac
3 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
client/mysqltest.c
View File

@ -1096,6 +1096,25 @@ char* safe_get_param(char* str, char** arg, const char* msg)
DBUG_RETURN(str);
}
int safe_connect(MYSQL* con, const char* host, const char* user,
const char* pass,
const char* db, int port, const char* sock)
{
int con_error = 1;
int i;
for (i = 0; i < MAX_CON_TRIES; ++i)
{
if(mysql_real_connect(con, host,user, pass,
db, port, sock, 0))
{
con_error = 0;
break;
}
sleep(CON_RETRY_SLEEP);
}
return con_error;
}
int do_connect(struct st_query* q)
{
@ -1104,7 +1123,7 @@ int do_connect(struct st_query* q)
char* p=q->first_argument;
char buff[FN_REFLEN];
int con_port;
int i, con_error;
int con_error;
DBUG_ENTER("do_connect");
DBUG_PRINT("enter",("connect: %s",p));
@ -1137,20 +1156,9 @@ int do_connect(struct st_query* q)
con_sock=fn_format(buff, con_sock, TMPDIR, "",0);
if (!con_db[0])
con_db=db;
con_error = 1;
for (i = 0; i < MAX_CON_TRIES; ++i)
{
if(mysql_real_connect(&next_con->mysql, con_host,
if((con_error = safe_connect(&next_con->mysql, con_host,
con_user, con_pass,
con_db, con_port, con_sock, 0))
{
con_error = 0;
break;
}
sleep(CON_RETRY_SLEEP);
}
if(con_error)
con_db, con_port, con_sock)))
die("Could not open connection '%s': %s", con_name,
mysql_error(&next_con->mysql));
@ -1950,9 +1958,8 @@ int main(int argc, char** argv)
if (!cur_con->name)
die("Out of memory");
if (!mysql_real_connect(&cur_con->mysql, host,
user, pass, db, port, unix_sock,
0))
if (safe_connect(&cur_con->mysql, host,
user, pass, db, port, unix_sock))
die("Failed in mysql_real_connect(): %s", mysql_error(&cur_con->mysql));
while (!read_query(&q))