Merge sanja.is.com.ua:/home/bell/mysql/mysql-3.23

into sanja.is.com.ua:/home/bell/mysql/work-3.23
This commit is contained in:
bell@sanja.is.com.ua 2003-02-18 09:58:25 +02:00
commit d7316689fd

View File

@ -449,17 +449,19 @@ public:
void update_used_tables() void update_used_tables()
{ {
if (!args[0]->maybe_null) if (!args[0]->maybe_null)
used_tables_cache=0; /* is always false */ {
used_tables_cache= 0; /* is always false */
cached_value= (longlong) 0;
}
else else
{ {
args[0]->update_used_tables(); args[0]->update_used_tables();
used_tables_cache=args[0]->used_tables(); if (!(used_tables_cache=args[0]->used_tables()))
} {
if (!used_tables_cache) /* Remember if the value is always NULL or never NULL */
{ args[0]->val();
/* Remember if the value is always NULL or never NULL */ cached_value= args[0]->null_value ? (longlong) 1 : (longlong) 0;
args[0]->val(); }
cached_value= args[0]->null_value ? (longlong) 1 : (longlong) 0;
} }
} }
optimize_type select_optimize() const { return OPTIMIZE_NULL; } optimize_type select_optimize() const { return OPTIMIZE_NULL; }