diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
| commit | 3b0c7ac1f9d64afc933ce0354037c709366b7dff (patch) | |
| tree | 39cefed54f79f93f82e9c33a4e094270103bf137 /sql/sql_select.h | |
| parent | e7cf898d6dc3dcac41f58db4761df3a6d1dffc03 (diff) | |
| parent | 22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff) | |
| download | mariadb-git-3b0c7ac1f9d64afc933ce0354037c709366b7dff.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 91f7d1619ea..3a0baf03c26 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -938,7 +938,7 @@ protected: enum enum_reopt_result { REOPT_NEW_PLAN, /* there is a new reoptimized plan */ REOPT_OLD_PLAN, /* no new improved plan can be found, use the old one */ - REOPT_ERROR, /* an irrecovarable error occured during reoptimization */ + REOPT_ERROR, /* an irrecovarable error occurred during reoptimization */ REOPT_NONE /* not yet reoptimized */ }; |