diff options
| author | Monty <monty@mariadb.org> | 2018-01-08 15:33:23 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-30 21:33:56 +0200 |
| commit | f55dc7f733446a201e3b465ae03a0388d192a3ad (patch) | |
| tree | 54bb6977650a907dcd069ef1b7124e61944ceabe /sql/sp_pcontext.cc | |
| parent | 18e22cb69f7d56207c80a5bf4336f2a52ff0d70f (diff) | |
| download | mariadb-git-f55dc7f733446a201e3b465ae03a0388d192a3ad.tar.gz | |
Change C_STRING_WITH_LEN to STRING_WITH_LEN
This preserves const str for constant strings
Other things
- A few variables where changed from LEX_STRING to LEX_CSTRING
- Incident_log_event::Incident_log_event and record_incident where
changed to take LEX_CSTRING* as an argument instead of LEX_STRING
Diffstat (limited to 'sql/sp_pcontext.cc')
| -rw-r--r-- | sql/sp_pcontext.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sp_pcontext.cc b/sql/sp_pcontext.cc index 1e2081e3479..d7bc26901b0 100644 --- a/sql/sp_pcontext.cc +++ b/sql/sp_pcontext.cc @@ -423,12 +423,12 @@ static sp_condition_value static sp_condition sp_predefined_conditions[]= { // Warnings - sp_condition(C_STRING_WITH_LEN("NO_DATA_FOUND"), &cond_no_data_found), + sp_condition(STRING_WITH_LEN("NO_DATA_FOUND"), &cond_no_data_found), // Errors - sp_condition(C_STRING_WITH_LEN("INVALID_CURSOR"), &cond_invalid_cursor), - sp_condition(C_STRING_WITH_LEN("DUP_VAL_ON_INDEX"), &cond_dup_val_on_index), - sp_condition(C_STRING_WITH_LEN("DUP_VAL_ON_INDEX"), &cond_dup_val_on_index2), - sp_condition(C_STRING_WITH_LEN("TOO_MANY_ROWS"), &cond_too_many_rows) + sp_condition(STRING_WITH_LEN("INVALID_CURSOR"), &cond_invalid_cursor), + sp_condition(STRING_WITH_LEN("DUP_VAL_ON_INDEX"), &cond_dup_val_on_index), + sp_condition(STRING_WITH_LEN("DUP_VAL_ON_INDEX"), &cond_dup_val_on_index2), + sp_condition(STRING_WITH_LEN("TOO_MANY_ROWS"), &cond_too_many_rows) }; |