Bug 76638

See bug 76620 comment 17

> Hmmm,
> 
> Now it fails at:
> 
> [build PAT] mysqlcppconn
> [build CFG] mysql
> 1 out of 2 hunks FAILED -- saving rejects to file
> driver/mysql_metadata.cpp.rej
> Patch FAILED:
> /Volumes/HD1/Shared/Repos/LO/core/external/mysqlcppconn/patches/
> retrieve_grants.patch.1
> make[1]: ***
> [/Volumes/HD1/Shared/Repos/LO/core/workdir/UnpackedTarball/mysqlcppconn.
> done] Error 1
> make[1]: *** Waiting for unfinished jobs....

mysql_metadata.cpp.rej


***************
*** 3633,3644 ****
- 	sql::SQLString strAllPrivs("ALTER, DELETE, DROP, INDEX, INSERT, LOCK TABLES, SELECT, UPDATE");
  
  	sql::SQLString cQuote(getIdentifierQuoteString());
  
  	while (rs->next() ) {
  		sql::SQLString aGrant = rs->getString(1);
  		aGrant = aGrant.replace(0, 6, "");
  
  		size_t pos = aGrant.find("ALL PRIVILEGES");
  
  		if (pos != sql::SQLString::npos) {
  			aGrant = aGrant.replace(pos, sizeof("ALL PRIVILEGES") - 1, strAllPrivs);
--- 3633,3646 ----
+ 	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);