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/sql_yacc.yy | |
| 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/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 00de8eb0655..7bf8d614553 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -16188,14 +16188,14 @@ opt_lock_wait_timeout: {} | WAIT_SYM ulong_num { - if (set_statement_var_if_exists(thd, C_STRING_WITH_LEN("lock_wait_timeout"), $2) || - set_statement_var_if_exists(thd, C_STRING_WITH_LEN("innodb_lock_wait_timeout"), $2)) + if (set_statement_var_if_exists(thd, STRING_WITH_LEN("lock_wait_timeout"), $2) || + set_statement_var_if_exists(thd, STRING_WITH_LEN("innodb_lock_wait_timeout"), $2)) MYSQL_YYABORT; } | NOWAIT_SYM { - if (set_statement_var_if_exists(thd, C_STRING_WITH_LEN("lock_wait_timeout"), 0) || - set_statement_var_if_exists(thd, C_STRING_WITH_LEN("innodb_lock_wait_timeout"), 0)) + if (set_statement_var_if_exists(thd, STRING_WITH_LEN("lock_wait_timeout"), 0) || + set_statement_var_if_exists(thd, STRING_WITH_LEN("innodb_lock_wait_timeout"), 0)) MYSQL_YYABORT; } ; |