summaryrefslogtreecommitdiff
path: root/sql/sql_help.cc
diff options
context:
space:
mode:
authorsergefp@mysql.com <>2004-12-14 03:36:19 +0300
committersergefp@mysql.com <>2004-12-14 03:36:19 +0300
commit3c8f48d2e39b513e9d2de0e10c04b4fc850356fd (patch)
tree7ef26d1f995140355d4c3b2d9b5b1992ddec220f /sql/sql_help.cc
parent3ceb04a5d8c12d76e52195c2112845387151469c (diff)
downloadmariadb-git-3c8f48d2e39b513e9d2de0e10c04b4fc850356fd.tar.gz
* Added comments and one assert
* Backport of safety measures from 5.0: make numeorous replaces: s/item->fix_fields()/if (!item->fixed) item->fix_fields()
Diffstat (limited to 'sql/sql_help.cc')
-rw-r--r--sql/sql_help.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc
index 04ecbbd43b9..0e0d32a922d 100644
--- a/sql/sql_help.cc
+++ b/sql/sql_help.cc
@@ -557,7 +557,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)))
{