diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-03-25 17:42:34 +0100 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-03-25 17:42:34 +0100 |
| commit | 4f5f7f353ac4783fae7aa0bff891d1325177cc82 (patch) | |
| tree | c5e1fcdb967de22a0abda1f95555773687774a41 /sql/sql_class.h | |
| parent | 67f9a6d1782ff9f00769816fdf3dfb1e9763bba7 (diff) | |
| parent | e46c139dd81081aceb27902ee4b632904cae292b (diff) | |
| download | mariadb-git-4f5f7f353ac4783fae7aa0bff891d1325177cc82.tar.gz | |
Bug#43748: crash when non-super user tries to kill the replication threads
manual merge. also adds test specific to 5.1+
mysql-test/suite/rpl/r/rpl_temporary.result:
show that a non-privileged user trying to
kill system-threads no longer crashes the
server. test in 5.1+ only.
mysql-test/suite/rpl/t/rpl_temporary.test:
show that a non-privileged user trying to
kill system-threads no longer crashes the
server. test in 5.1+ only.
sql/sql_class.cc:
manual merge
sql/sql_class.h:
manual merge
sql/sql_parse.cc:
manual merge
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 304937101c4..148e4b86e9e 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -813,6 +813,7 @@ public: void restore_security_context(THD *thd, Security_context *backup); #endif + bool user_matches(Security_context *); }; |