diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-03-26 18:59:33 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-03-26 18:59:33 +0100 |
| commit | b26f2645d30de5ef86eaeb91ef5346135cfe256d (patch) | |
| tree | 39dde2ddecad7b076f48839ac20497158bb77d6a /external | |
| parent | 190085dd4d1bc8cdfa5573158c8986b757ac1faf (diff) | |
Resolves: fdo#76638 Patch retrieve_grants.patch.1 fails
Let's remove this since the future is MariaDB
Change-Id: I39641f81c59e7d024aaf48e8e3cc9fc9a7c3127c
Diffstat (limited to 'external')
| -rw-r--r-- | external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk | 1 | ||||
| -rw-r--r-- | external/mysqlcppconn/patches/retrieve_grants.patch.1 | 31 |
2 files changed, 0 insertions, 32 deletions
diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk index ddcb5221e753..9c2282e52117 100644 --- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk +++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk @@ -18,7 +18,6 @@ $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_ $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\ external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \ external/mysqlcppconn/patches/default_to_protocol_tcp.patch \ - external/mysqlcppconn/patches/retrieve_grants.patch.1 \ external/mysqlcppconn/patches/warnings.patch.0 \ )) diff --git a/external/mysqlcppconn/patches/retrieve_grants.patch.1 b/external/mysqlcppconn/patches/retrieve_grants.patch.1 deleted file mode 100644 index eb63cff9cbe5..000000000000 --- a/external/mysqlcppconn/patches/retrieve_grants.patch.1 +++ /dev/null @@ -1,31 +0,0 @@ -diff -ur mysqlcppconn.org/driver/mysql_metadata.cpp mysqlcppconn/driver/mysql_metadata.cpp ---- mysqlcppconn.org/driver/mysql_metadata.cpp 2013-12-20 22:12:07.044698692 +0100 -+++ mysqlcppconn/driver/mysql_metadata.cpp 2013-12-20 22:14:56.320394472 +0100 -@@ -3633,12 +3633,14 @@ -- sql::SQLString strAllPrivs("ALTER, DELETE, DROP, INDEX, INSERT, LOCK TABLES, SELECT, UPDATE"); -+ sql::SQLString strAllPrivs("SELECT, INSERT, UPDATE, DELETE, CREATE, DROPT, GRANT, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER"); - - sql::SQLString cQuote(getIdentifierQuoteString()); -+ size_t posIsGrantable = sql::SQLString::npos; - - while (rs->next() ) { - sql::SQLString aGrant = rs->getString(1); - aGrant = aGrant.replace(0, 6, ""); - - size_t pos = aGrant.find("ALL PRIVILEGES"); -+ posIsGrantable = aGrant.find("WITH GRANT OPTION"); - - if (pos != sql::SQLString::npos) { - aGrant = aGrant.replace(pos, sizeof("ALL PRIVILEGES") - 1, strAllPrivs); -@@ -3737,7 +3739,10 @@ - rs_data_row.push_back(""); // GRANTOR - rs_data_row.push_back(getUserName()); // GRANTEE - rs_data_row.push_back(privToken); // PRIVILEGE -- rs_data_row.push_back(""); // IS_GRANTABLE - ToDo maybe here WITH GRANT OPTION?? -+ if (posIsGrantable != sql::SQLString::npos) -+ rs_data_row.push_back("YES"); -+ else -+ rs_data_row.push_back(""); // IS_GRANTABLE - - rs_data->push_back(rs_data_row); - } |