diff options
| author | unknown <monty@mysql.com> | 2004-11-02 08:58:45 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-02 08:58:45 +0200 |
| commit | 94839ddf5e23998c4e90776912f7d92a90277628 (patch) | |
| tree | f21b1c5d561fe5ca25c7f1f93db8805c0f4f3940 /innobase/pars | |
| parent | 46aa022aa6cf40801518d1be2c9e8e7ffcee9928 (diff) | |
| parent | 61ac832464a48afcf85f8c302734aa01d4346c78 (diff) | |
| download | mariadb-git-94839ddf5e23998c4e90776912f7d92a90277628.tar.gz | |
merge with 4.0
Build-tools/mysql-copyright:
Auto merged
Docs/Support/texi2html:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/eval/eval0eval.c:
Auto merged
innobase/pars/pars0pars.c:
Auto merged
Diffstat (limited to 'innobase/pars')
| -rw-r--r-- | innobase/pars/pars0pars.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/innobase/pars/pars0pars.c b/innobase/pars/pars0pars.c index 846cb060a7e..16d630dd318 100644 --- a/innobase/pars/pars0pars.c +++ b/innobase/pars/pars0pars.c @@ -259,9 +259,13 @@ pars_resolve_func_data_type( dtype_set(que_node_get_data_type(node), DATA_VARCHAR, DATA_ENGLISH, 0, 0); } else if (func == PARS_TO_BINARY_TOKEN) { - ut_a(dtype_get_mtype(que_node_get_data_type(arg)) == DATA_INT); - dtype_set(que_node_get_data_type(node), DATA_VARCHAR, + if (dtype_get_mtype(que_node_get_data_type(arg)) == DATA_INT) { + dtype_set(que_node_get_data_type(node), DATA_VARCHAR, DATA_ENGLISH, 0, 0); + } else { + dtype_set(que_node_get_data_type(node), DATA_BINARY, + 0, 0, 0); + } } else if (func == PARS_TO_NUMBER_TOKEN) { ut_a(dtype_get_mtype(que_node_get_data_type(arg)) == DATA_VARCHAR); |