diff options
| author | baker@bk-internal.mysql.com <> | 2006-12-03 21:19:35 +0100 |
|---|---|---|
| committer | baker@bk-internal.mysql.com <> | 2006-12-03 21:19:35 +0100 |
| commit | dbe5f0acc5e9d59d5baa3e9d21e3a17e7f371148 (patch) | |
| tree | 6ba887bb99250d0f79767a453ce445684766e62b /sql/item_subselect.h | |
| parent | a63d255bac88cfa9396330a409b3a7e5437ec9e5 (diff) | |
| parent | 31d67280f71b3ce47465c1844e09465e602522a4 (diff) | |
| download | mariadb-git-dbe5f0acc5e9d59d5baa3e9d21e3a17e7f371148.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index c274b5ca31b..d4390ef13e9 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -323,7 +323,7 @@ public: result= res; item= si; res_type= STRING_RESULT; - res_field_type= FIELD_TYPE_VAR_STRING; + res_field_type= MYSQL_TYPE_VAR_STRING; maybe_null= 0; } virtual ~subselect_engine() {}; // to satisfy compiler |