diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-22 13:03:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-22 13:03:41 +0200 |
| commit | 9d2e2d753323a934604d25144b9d1ecaf34b47d8 (patch) | |
| tree | 051a721f7ea77c2278d09323e36088abe22aa66a /sql/sql_yacc.yy | |
| parent | d11af09865299033d5eef64531704f6ab8af5304 (diff) | |
| parent | 2eb3c5e5420a724945a4cba914df25aa1e3744ce (diff) | |
| download | mariadb-git-9d2e2d753323a934604d25144b9d1ecaf34b47d8.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b4c0c4d45c3..3fda8832f6b 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4678,17 +4678,11 @@ size_number: switch (end_ptr[0]) { case 'g': - case 'G': - text_shift_number+=10; - /* fall through */ + case 'G': text_shift_number+=30; break; case 'm': - case 'M': - text_shift_number+=10; - /* fall through */ + case 'M': text_shift_number+=20; break; case 'k': - case 'K': - text_shift_number+=10; - break; + case 'K': text_shift_number+=10; break; default: my_yyabort_error((ER_WRONG_SIZE_NUMBER, MYF(0))); } |