mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: fdo#76638 Patch retrieve_grants.patch.1 fails

Browse Source 
Let's remove this since the future is MariaDB

Change-Id: I39641f81c59e7d024aaf48e8e3cc9fc9a7c3127c
This commit is contained in:
Julien Nabet 2014-03-26 18:59:33 +01:00
parent 190085dd4d
commit b26f2645d3
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk vendored
View File

@ -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 \
))

31
external/mysqlcppconn/patches/retrieve_grants.patch.1 vendored
View File

@ -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);
}