diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 09:25:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 09:25:46 +0300 |
| commit | 71fc31ba360e7caf384ad2c0c44e7b01f34c7b43 (patch) | |
| tree | ff864d9b5726c89aff9514c9939aadbb299dbc0d /sql/sql_class.h | |
| parent | dee24f31555ebbecb0843b34e35ba0ab21a9fe9a (diff) | |
| parent | 0c0b697ae327e75388572da81a49b18640193ba5 (diff) | |
| download | mariadb-git-71fc31ba360e7caf384ad2c0c44e7b01f34c7b43.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index efed7b9bad2..207bc074bd5 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3632,6 +3632,8 @@ public: /* In case of a slave, set to the error code the master got when executing the query. 0 if no error on the master. + The stored into variable master error code may get reset inside + execution stack when the event turns out to be ignored. */ int slave_expected_error; enum_sql_command last_sql_command; // Last sql_command exceuted in mysql_execute_command() |