database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge macbook.gmz:/Users/kgeorge/mysql/work/B21019-4.1-opt

Browse Source 
into  macbook.gmz:/Users/kgeorge/mysql/work/B21019-5.0-opt
This commit is contained in:
gkodinov/kgeorge@macbook.gmz
2006-07-26 17:31:34 +03:00
parent 67dd8dce0e 6766cfcdf9
commit 66e65eff14
3 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_select.cc
View File

@ -2490,8 +2490,11 @@ merge_key_fields(KEY_FIELD *start,KEY_FIELD *new_fields,KEY_FIELD *end,
/* field = expression OR field IS NULL */
old->level= and_level;
old->optimize= KEY_OPTIMIZE_REF_OR_NULL;
/* Remember the NOT NULL value */
if (old->val->is_null())
/*
Remember the NOT NULL value unless the value does not depend
on other tables.
*/
if (!old->val->used_tables() && old->val->is_null())
old->val= new_fields->val;
/* The referred expression can be NULL: */
old->null_rejecting= 0;