1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#23035296: MAIN.MYSQLDUMP FAILS BECUASE OF UNEXPECTED

Browse Source 
ERROR MESSAGE

Post push patch to fix test case failure.
This commit is contained in:
Arun Kuruvila 2016-06-03 12:50:23 +05:30
parent 07e50c4291
commit df0d8efaf2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/mysqlimport.c
View File

@ -418,13 +418,19 @@ static MYSQL *db_connect(char *host, char *database,
MYSQL *mysql;
if (verbose)
fprintf(stdout, "Connecting to %s\n", host ? host : "localhost");
pthread_mutex_lock(&init_mutex);
if (!(mysql= mysql_init(NULL)))
if (opt_use_threads && !lock_tables)
{
pthread_mutex_lock(&init_mutex);
if (!(mysql= mysql_init(NULL)))
{
pthread_mutex_unlock(&init_mutex);
return 0;
}
pthread_mutex_unlock(&init_mutex);
return 0;
}
pthread_mutex_unlock(&init_mutex);
else
if (!(mysql= mysql_init(NULL)))
return 0;
if (opt_compress)
mysql_options(mysql,MYSQL_OPT_COMPRESS,NullS);
if (opt_local_file)