SEGFAULT in get_column_grant()

ip1981 · cvicentiu · commit e5410da190d3 · 2016-04-21T08:18:54.000-07:00
Due to a typo, the wrong grant_table was used when fetching privileges
for roles.

Signed-off-by: Vicențiu Ciorbaru &lt;vicentiu@mariadb.org&gt;
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
@@ -7453,7 +7453,8 @@ ulong get_column_grant(THD *thd, GRANT_INFO *grant,
       if (!grant_column)
         priv|= (grant->privilege | grant_table_role->privs);
       else
-        priv|= (grant->privilege | grant_table->privs | grant_column->rights);
+        priv|= (grant->privilege | grant_table_role->privs |
+                grant_column->rights);
     }
   }
   mysql_rwlock_unlock(&LOCK_grant);

Original file line number	Diff line number	Diff line change
`@@ -7453,7 +7453,8 @@ ulong get_column_grant(THD thd, GRANT_INFO grant,`
`7453`	`7453`	`if (!grant_column)`
`7454`	`7454`	`priv\|= (grant->privilege \| grant_table_role->privs);`
`7455`	`7455`	`else`
`7456`		`- priv\|= (grant->privilege \| grant_table->privs \| grant_column->rights);`
	`7456`	`+ priv\|= (grant->privilege \| grant_table_role->privs \|`
	`7457`	`+ grant_column->rights);`
`7457`	`7458`	`}`
`7458`	`7459`	`}`
`7459`	`7460`	`mysql_rwlock_unlock(&LOCK_grant);`