diff options
| author | unknown <baker@bk-internal.mysql.com> | 2006-12-03 21:19:35 +0100 |
|---|---|---|
| committer | unknown <baker@bk-internal.mysql.com> | 2006-12-03 21:19:35 +0100 |
| commit | cac6be1949a5947c7fae939ba7c557fff89d8355 (patch) | |
| tree | 6ba887bb99250d0f79767a453ce445684766e62b /sql/item_subselect.h | |
| parent | da7016ee74c9e78e8eb569a9e325b8db59cb0859 (diff) | |
| parent | d6541d099b6873099a3fb5179e8ab7476cdac17d (diff) | |
| download | mariadb-git-cac6be1949a5947c7fae939ba7c557fff89d8355.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
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 |