summaryrefslogtreecommitdiff
path: root/storage/innobase/pars/pars0sym.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-04-10 01:36:33 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-04-17 03:20:34 +0300
commita039d6c3e6dc4f5131432ce5e540c83d04087474 (patch)
tree66cbdfb34de864fdbe8f16f4cfaa317ebe5ca260 /storage/innobase/pars/pars0sym.cc
parente5eef05140bc6ef587672cf964a6453de7f121c5 (diff)
downloadmariadb-git-a039d6c3e6dc4f5131432ce5e540c83d04087474.tar.gz
Remove unused tokens from the InnoDB SQL parser.
PARS_INTEGER_TOKEN: Remove. The lexer returns only PARS_INT_TOKEN. PARS_FIXBINARY_LIT, PARS_BLOB_LIT: Remove. These are never returned by the lexer. In sym_tab_add_bound_lit(), use PARS_STR_LIT.
Diffstat (limited to 'storage/innobase/pars/pars0sym.cc')
-rw-r--r--storage/innobase/pars/pars0sym.cc16
1 files changed, 3 insertions, 13 deletions
diff --git a/storage/innobase/pars/pars0sym.cc b/storage/innobase/pars/pars0sym.cc
index ed49500dd94..8249af53b39 100644
--- a/storage/innobase/pars/pars0sym.cc
+++ b/storage/innobase/pars/pars0sym.cc
@@ -223,25 +223,15 @@ sym_tab_add_bound_lit(
switch (blit->type) {
case DATA_FIXBINARY:
+ case DATA_CHAR:
+ ut_ad(blit->length > 0);
len = blit->length;
- *lit_type = PARS_FIXBINARY_LIT;
- break;
-
+ /* fall through */
case DATA_BLOB:
- *lit_type = PARS_BLOB_LIT;
- break;
-
case DATA_VARCHAR:
*lit_type = PARS_STR_LIT;
break;
- case DATA_CHAR:
- ut_a(blit->length > 0);
-
- len = blit->length;
- *lit_type = PARS_STR_LIT;
- break;
-
case DATA_INT:
ut_a(blit->length > 0);
ut_a(blit->length <= 8);