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/item.h | |
| parent | e7cf898d6dc3dcac41f58db4761df3a6d1dffc03 (diff) | |
| parent | 22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff) | |
| download | mariadb-git-3b0c7ac1f9d64afc933ce0354037c709366b7dff.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index c1a8b06fae1..6e0a4aa82ce 100644 --- a/sql/item.h +++ b/sql/item.h @@ -429,7 +429,7 @@ public: RETURN FALSE if parameter value has been set, - TRUE if error has occured. + TRUE if error has occurred. */ virtual bool set_value(THD *thd, sp_rcontext *ctx, Item **it)= 0; @@ -2692,7 +2692,7 @@ public: /* If value for parameter was not set we treat it as non-const - so noone will use parameters value in fix_fields still + so no one will use parameters value in fix_fields still parameter is constant during execution. */ virtual table_map used_tables() const |