diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-10-31 18:07:02 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-10-31 18:07:02 -0400 |
| commit | 4d1511296288782df0e3d9373396724e250b24c1 (patch) | |
| tree | 9fa47d141b71933859d6c2da585e5bb5e52db212 /client | |
| parent | 17b0b45b1de41a1b188c5de6c3e9d8e6ecc48a72 (diff) | |
| parent | d775ecdd010daad4dc6147fba58acd006bf2c60c (diff) | |
| download | mariadb-git-4d1511296288782df0e3d9373396724e250b24c1.tar.gz | |
Merge tag 'mariadb-10.0.22' into 10.0-galera
Diffstat (limited to 'client')
| -rw-r--r-- | client/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | client/mysql_upgrade.c | 1 | ||||
| -rw-r--r-- | client/mysqlimport.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 1bf466c1e47..e4643ad9358 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -51,6 +51,7 @@ MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c) TARGET_LINK_LIBRARIES(mysqldump mysqlclient) MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) +SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 0b312ef5f2f..0dfcd81bdf9 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -870,6 +870,7 @@ static const char *expected_errors[]= "ERROR 1060", /* Duplicate column name */ "ERROR 1061", /* Duplicate key name */ "ERROR 1054", /* Unknown column */ + "ERROR 1290", /* RR_OPTION_PREVENTS_STATEMENT */ 0 }; diff --git a/client/mysqlimport.c b/client/mysqlimport.c index cf1df1e95d8..2363f1b69df 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -1,5 +1,6 @@ /* - Copyright (c) 2000, 2012, Oracle and/or its affiliates. + Copyright (c) 2000, 2015, Oracle and/or its affiliates. + Copyright (c) 2011, 2015, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,7 +31,6 @@ #include "client_priv.h" #include "mysql_version.h" -#include <my_pthread.h> #include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */ @@ -484,7 +484,6 @@ static void db_disconnect(char *host, MYSQL *mysql) } - static void safe_exit(int error, MYSQL *mysql) { if (error && ignore_errors) |