1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mashka.mysql.fi:/home/my/mysql-4.0

Browse Source 
into mashka.mysql.fi:/home/my/mysql-4.1
This commit is contained in:
monty@mashka.mysql.fi 2003-02-10 01:21:39 +02:00
commit aee7346ec1
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BUILD/FINISH.sh
View File

@ -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 ]

BIN
netware/mysqld.xdc Normal file
View File

Binary file not shown.

14
sql/opt_range.cc
View File

@ -501,10 +501,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)
{
@ -1020,17 +1021,6 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part,
if (value->save_in_field(field, 1) > 0)
{
/* 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