diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-22 09:20:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-22 09:46:51 +0300 |
| commit | 70505dd45bd36516206eeeb5dcaa28e5f5a1d6dd (patch) | |
| tree | 14d0c4dba49e36dc0d80c1ba99757b4074781d2d /sql/sql_yacc.yy | |
| parent | 7edadde72eb23e9110db8cea810c023104e9d15e (diff) | |
| parent | 13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5 (diff) | |
| download | mariadb-git-70505dd45bd36516206eeeb5dcaa28e5f5a1d6dd.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index fdb40407ffb..2a9046f0ecc 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4774,9 +4774,11 @@ size_number: case 'g': case 'G': text_shift_number+=10; + /* fall through */ case 'm': case 'M': text_shift_number+=10; + /* fall through */ case 'k': case 'K': text_shift_number+=10; |