diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-10 01:21:09 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-10 01:21:09 +0200 |
| commit | 335621a520516fd1a917d66711d96e33900be80e (patch) | |
| tree | 890a223355a4c56b7ccfcb5d611be45b944db58e | |
| parent | 0355029fd7c7b13c77b2357df92ec4f2640343f9 (diff) | |
| download | mariadb-git-335621a520516fd1a917d66711d96e33900be80e.tar.gz | |
Fixed memory reference error when doing key_column <=> NULL on column that is defined as NOT NULL
BUILD/FINISH.sh:
Abort if one of configuration script fails
| -rw-r--r-- | BUILD/FINISH.sh | 6 | ||||
| -rw-r--r-- | sql/opt_range.cc | 14 |
2 files changed, 7 insertions, 13 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 82f31a14dc4..5358667b881 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -13,7 +13,11 @@ commands="\ $make -k clean || true /bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache -aclocal && autoheader && aclocal && automake && autoconf +if [ ! aclocal ] ; then echo \"Can't execute aclocal\" ; exit 1; fi +if [ ! autoheader ] ; then echo \"Can't execute autoheader\" ; exit 1; fi +if [ ! aclocal ] ; then echo \"Can't execute aclocal\" ; exit 1; fi +if [ ! automake ] ; then echo \"Can't execute automake\" ; exit 1; fi +if [ ! autoconf ] ; then echo \"Can't execute autoconf\" ; exit 1; fi (cd bdb/dist && sh s_all) (cd innobase && aclocal && autoheader && aclocal && automake && autoconf) if [ -d gemini ] diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 0407aabc327..c1b03ed629f 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -505,10 +505,11 @@ SEL_ARG *SEL_ARG::last() return next_arg; } + /* Check if a compare is ok, when one takes ranges in account Returns -2 or 2 if the ranges where 'joined' like < 2 and >= 2 - */ +*/ static int sel_cmp(Field *field, char *a,char *b,uint8 a_flag,uint8 b_flag) { @@ -1032,17 +1033,6 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part, if (value->save_in_field(field, 1)) { /* This happens when we try to insert a NULL field in a not null column */ - // TODO; Check if we can we remove the following block. - if (type == Item_func::EQUAL_FUNC) - { - /* convert column_name <=> NULL -> column_name IS NULL */ - // Get local copy of key - char *str= (char*) alloc_root(param->mem_root,1); - if (!str) - DBUG_RETURN(0); - *str= 1; - DBUG_RETURN(new SEL_ARG(field,str,str)); - } DBUG_RETURN(&null_element); // cmp with NULL is never true } // Get local copy of key |