Skip to content

Commit

Permalink
parser: better error messages for CHECK/REPAIR VIEW
Browse files Browse the repository at this point in the history 
remove the code that checks for correct options for
for CHECK/REPAIR VIEW. Rewrite the grammar for the parser
to check that. This changes error messages as

-ERROR 42000: You have an error ... near '' at line 1
+ERROR 42000: You have an error ... near 'quick' at line 1
  • Loading branch information
@vuvova
vuvova committed Jun 3, 2015
1 parent 0ffef5d commit 64569fa
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 33 deletions.
35 changes: 35 additions & 0 deletions mysql-test/r/mysql_upgrade_view.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,41 @@ drop table if exists t1,v1,v2,v3,v4,v1badcheck;
drop view if exists t1,v1,v2,v3,v4,v1badcheck;
create table t1(a int);
create table kv(k varchar(30) NOT NULL PRIMARY KEY,v varchar(50));
create view v1 as select 1;
repair table t1 quick;
Table Op Msg_type Msg_text
test.t1 repair status OK
repair table t1 extended;
Table Op Msg_type Msg_text
test.t1 repair status OK
repair table t1 use_frm;
Table Op Msg_type Msg_text
test.t1 repair status OK
repair table t1 from mysql;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from mysql' at line 1
repair view v1 quick;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'quick' at line 1
repair view v1 extended;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'extended' at line 1
repair view v1 use_frm;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'use_frm' at line 1
repair view v1 from mysql;
Table Op Msg_type Msg_text
test.v1 repair status OK
check view v1 quick;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'quick' at line 1
check view v1 fast;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'fast' at line 1
check view v1 medium;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'medium' at line 1
check view v1 extended;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'extended' at line 1
check view v1 changed;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'changed' at line 1
check view v1 for upgrade;
Table Op Msg_type Msg_text
test.v1 check status OK
drop view v1;
flush tables;
check view v1;
Table Op Msg_type Msg_text
Expand Down
29 changes: 29 additions & 0 deletions mysql-test/t/mysql_upgrade_view.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,35 @@ drop view if exists t1,v1,v2,v3,v4,v1badcheck;

create table t1(a int);
create table kv(k varchar(30) NOT NULL PRIMARY KEY,v varchar(50));
create view v1 as select 1;

repair table t1 quick;
repair table t1 extended;
repair table t1 use_frm;
--error ER_PARSE_ERROR
repair table t1 from mysql;

--error ER_PARSE_ERROR
repair view v1 quick;
--error ER_PARSE_ERROR
repair view v1 extended;
--error ER_PARSE_ERROR
repair view v1 use_frm;
repair view v1 from mysql;

--error ER_PARSE_ERROR
check view v1 quick;
--error ER_PARSE_ERROR
check view v1 fast;
--error ER_PARSE_ERROR
check view v1 medium;
--error ER_PARSE_ERROR
check view v1 extended;
--error ER_PARSE_ERROR
check view v1 changed;
check view v1 for upgrade;

drop view v1;

let $MYSQLD_DATADIR= `select @@datadir`;

Expand Down
1 change: 1 addition & 0 deletions sql/sql_lex.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ void lex_start(THD *thd)

lex->is_lex_started= TRUE;
lex->used_tables= 0;
lex->only_view= FALSE;
lex->reset_slave_info.all= false;
lex->limit_rows_examined= 0;
lex->limit_rows_examined_cnt= ULONGLONG_MAX;
Expand Down
60 changes: 27 additions & 33 deletions sql/sql_yacc.yy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7191,8 +7191,13 @@ opt_checksum_type:
| EXTENDED_SYM { Lex->check_opt.flags= T_EXTEND; }
;

repair_table_or_view:
table_or_tables table_list opt_mi_repair_type
| VIEW_SYM { Lex->only_view= TRUE; } table_list opt_view_repair_type
;

repair:
REPAIR opt_no_write_to_binlog table_or_view
REPAIR opt_no_write_to_binlog
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_REPAIR;
Expand All @@ -7202,18 +7207,9 @@ repair:
/* Will be overriden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
table_list opt_mi_repair_type
repair_table_or_view
{
LEX* lex= thd->lex;
if ((lex->only_view &&
((lex->check_opt.flags & (T_QUICK | T_EXTEND)) ||
(lex->check_opt.sql_flags & TT_USEFRM))) ||
(!lex->only_view &&
(lex->check_opt.sql_flags & TT_FROM_MYSQL)))
{
my_parse_error(ER(ER_SYNTAX_ERROR));
MYSQL_YYABORT;
}
DBUG_ASSERT(!lex->m_stmt);
lex->m_stmt= new (thd->mem_root) Repair_table_statement(lex);
if (lex->m_stmt == NULL)
Expand All @@ -7235,6 +7231,10 @@ mi_repair_type:
QUICK { Lex->check_opt.flags|= T_QUICK; }
| EXTENDED_SYM { Lex->check_opt.flags|= T_EXTEND; }
| USE_FRM { Lex->check_opt.sql_flags|= TT_USEFRM; }
;

opt_view_repair_type:
/* empty */ { }
| FROM MYSQL_SYM { Lex->check_opt.sql_flags|= TT_FROM_MYSQL; }
;

Expand Down Expand Up @@ -7267,30 +7267,27 @@ binlog_base64_event:
}
;

check:
CHECK_SYM table_or_view
check_view_or_table:
table_or_tables table_list opt_mi_check_type
| VIEW_SYM { Lex->only_view= TRUE; } table_list opt_view_check_type
;

check: CHECK_SYM
{
LEX *lex=Lex;

if (lex->sphead)
{
my_error(ER_SP_BADSTATEMENT, MYF(0), "CHECK");
MYSQL_YYABORT;
}
lex->sql_command = SQLCOM_CHECK;
lex->check_opt.init();
lex->alter_info.reset();
/* Will be overriden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
table_list opt_mi_check_type
check_view_or_table
{
LEX* lex= thd->lex;
if (lex->only_view &&
(lex->check_opt.flags & (T_QUICK | T_FAST | T_EXTEND |
T_CHECK_ONLY_CHANGED)))
if (lex->sphead)
{
my_parse_error(ER(ER_SYNTAX_ERROR));
my_error(ER_SP_BADSTATEMENT, MYF(0), "CHECK");
MYSQL_YYABORT;
}
DBUG_ASSERT(!lex->m_stmt);
Expand Down Expand Up @@ -7319,6 +7316,11 @@ mi_check_type:
| FOR_SYM UPGRADE_SYM { Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; }
;

opt_view_check_type:
/* empty */ { }
| FOR_SYM UPGRADE_SYM { Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; }
;

optimize:
OPTIMIZE opt_no_write_to_binlog table_or_tables
{
Expand Down Expand Up @@ -7400,7 +7402,6 @@ keycache:
LEX *lex=Lex;
lex->sql_command= SQLCOM_ASSIGN_TO_KEYCACHE;
lex->ident= $6;
lex->only_view= FALSE;
}
;

Expand Down Expand Up @@ -7445,7 +7446,6 @@ preload:
LEX *lex=Lex;
lex->sql_command=SQLCOM_PRELOAD_KEYS;
lex->alter_info.reset();
lex->only_view= FALSE;
}
preload_list_or_parts
{}
Expand Down Expand Up @@ -11610,7 +11610,6 @@ show_param:
lex->sql_command = SQLCOM_SHOW_CREATE;
if (!lex->select_lex.add_table_to_list(thd, $3, NULL,0))
MYSQL_YYABORT;
lex->only_view= 0;
lex->create_info.storage_media= HA_SM_DEFAULT;
}
| CREATE VIEW_SYM table_ident
Expand Down Expand Up @@ -13806,13 +13805,8 @@ lock:
;

table_or_tables:
TABLE_SYM { Lex->only_view= FALSE; }
| TABLES { Lex->only_view= FALSE; }
;

table_or_view:
table_or_tables
| VIEW_SYM { Lex->only_view= TRUE; }
TABLE_SYM { }
| TABLES { }
;

table_lock_list:
Expand Down

0 comments on commit 64569fa

Please sign in to comment.