mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
BUG#21033 The error log of mysqld shows useless information, and hides the real error.
storage/ndb/src/ndbapi/Ndb.cpp: Ndb.closeTransaction() modifies the value of Ndb.theError.code, but the error code shouldn't be changed here. Mysqld will use the returning error code to log the correct information.
This commit is contained in:
parent
2635718dbd
commit
59da4b424d
1 changed files with 5 additions and 0 deletions
|
@ -1147,9 +1147,14 @@ error_handler:
|
||||||
theError.code = tOperation->theError.code;
|
theError.code = tOperation->theError.code;
|
||||||
DBUG_ASSERT(theError.code != 0);
|
DBUG_ASSERT(theError.code != 0);
|
||||||
|
|
||||||
|
NdbError savedError;
|
||||||
|
savedError = theError;
|
||||||
|
|
||||||
if (tConnection != NULL)
|
if (tConnection != NULL)
|
||||||
this->closeTransaction(tConnection);
|
this->closeTransaction(tConnection);
|
||||||
|
|
||||||
|
theError = savedError;
|
||||||
|
|
||||||
DBUG_RETURN(-1);
|
DBUG_RETURN(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue