summaryrefslogtreecommitdiff
path: root/mysql-test/std_data
diff options
context:
space:
mode:
authorKristofer Pettersson <kristofer.pettersson@sun.com>2010-01-13 12:39:00 +0100
committerKristofer Pettersson <kristofer.pettersson@sun.com>2010-01-13 12:39:00 +0100
commitb3dd4d9486ca00e555823f81185fe9db83a44db5 (patch)
treea9737c2a19850c10398e9f47d40c82ee4deefbe2 /mysql-test/std_data
parentbe397eb40061afdc924cabb96efca0ec736b5181 (diff)
downloadmariadb-git-b3dd4d9486ca00e555823f81185fe9db83a44db5.tar.gz
Bug#33982 debug assertion and crash reloading grant tables after sighup or kill
In certain rare cases when a process was interrupted during a FLUSH PRIVILEGES operation the diagnostic area would be set to an error state but the function responsible for the operation would still signal success. This would lead to a debug assertion error later on when the server would attempt to reset the DA before sending the error message. This patch fixes the issue by assuring that reload_acl_and_cache() always fails if an error condition is raised. The second issue was that a KILL could cause a console error message which referred to a DA state without first making sure that such a state existed. This patch fixes this issue in two different palces by first checking DA state before fetching the error message. sql/sql_acl.cc: * Make sure that there is an error to print before attempting to do so. * Minor style change: change 1 to TRUE for clarity. sql/sql_parse.cc: * Always fail reload_acl_and_cache() if the query was killed. sql/sql_servers.cc: * Make sure that there is an error to print before attempting to do so.
Diffstat (limited to 'mysql-test/std_data')
0 files changed, 0 insertions, 0 deletions