diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:26:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:26:21 +0300 |
| commit | 38d36b59f925dc19f5b8346b3e54bec782771967 (patch) | |
| tree | 2a7aa642243541497db4f11a4ba5f893353c1701 /sql/sql_class.h | |
| parent | 38dda1f026fa9ff449950b4497b6bde04dc28734 (diff) | |
| parent | c7ba2377936be2a3c84080359d87f7486ce682a0 (diff) | |
| download | mariadb-git-38d36b59f925dc19f5b8346b3e54bec782771967.tar.gz | |
Merge 10.4 into 10.5
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 4b674ce77c0..a21e1351cb3 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3361,6 +3361,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() |