diff options
| author | unknown <monty@tik.mysql.fi> | 2001-07-04 09:39:58 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-07-04 09:39:58 +0300 |
| commit | 9a811481b21c3ac3a349b2311a92558e397bc764 (patch) | |
| tree | 1aebd400b499a8cbeaef3fb0b970cba953f38373 /sql/sql_yacc.yy | |
| parent | 09b6895facbfafb492d543e1ee801fd3075290c0 (diff) | |
| download | mariadb-git-9a811481b21c3ac3a349b2311a92558e397bc764.tar.gz | |
Added support for ANSI SQL X'hex-string' format.
Fixed mysqldump to use -- instead of # as comment characters.
Removed support for the 3.20 protocol format
Docs/manual.texi:
Update Changelog
client/mysqldump.c:
Fixed dump to use -- instead of # as comment characters.
libmysql/libmysql.c:
Removed support for the 3.20 protocol format
myisam/myisamchk.c:
Fixed typo in printf
mysql-test/r/varbinary.result:
Test of new hex constant format
mysql-test/t/varbinary.test:
Test of new hex constant format
sql/sql_lex.cc:
Added support for ANSI SQL X'hex-string' format.
sql/sql_lex.h:
Added support for ANSI SQL X'hex-string' format.
sql/sql_yacc.yy:
Added support for ANSI SQL X'hex-string' format.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index c013ebe1c8c..d7837d928a0 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -133,6 +133,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token BINLOG_SYM %token EVENTS_SYM +%token ABORT_SYM %token ACTION %token AGGREGATE_SYM %token ALL @@ -3022,7 +3023,7 @@ option_value: | SQL_SLAVE_SKIP_COUNTER equal ULONG_NUM { pthread_mutex_lock(&LOCK_slave); - if(slave_running) + if (slave_running) send_error(¤t_thd->net, ER_SLAVE_MUST_STOP); else slave_skip_counter = $3; |