diff options
| author | monty@mishka.local <> | 2004-12-22 13:54:39 +0200 |
|---|---|---|
| committer | monty@mishka.local <> | 2004-12-22 13:54:39 +0200 |
| commit | 4f4bbfc279800923299df1fefeb2fcd299fcde90 (patch) | |
| tree | 8e5f08b17957f896c2d4e931e60b57d99c260ed6 /sql/sql_help.cc | |
| parent | 198dc7a8ec6e220c348bb47e59a2ac7532be18b8 (diff) | |
| parent | 98f2a83539735f1a69680195290adcf02861f073 (diff) | |
| download | mariadb-git-4f4bbfc279800923299df1fefeb2fcd299fcde90.tar.gz | |
Merge with 4.1
Diffstat (limited to 'sql/sql_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index f71e9a7133a..99273b42f2a 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -556,7 +556,8 @@ int send_variant_2_list(MEM_ROOT *mem_root, Protocol *protocol, SQL_SELECT *prepare_simple_select(THD *thd, Item *cond, TABLE_LIST *tables, TABLE *table, int *error) { - cond->fix_fields(thd, tables, &cond); // can never fail + if (!cond->fixed) + cond->fix_fields(thd, tables, &cond); // can never fail SQL_SELECT *res= make_select(table,0,0,cond,error); if (*error || (res && res->check_quick(thd, 0, HA_POS_ERROR))) { |