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

Fix after merge

Browse Source
This commit is contained in:
monty@hundin.mysql.fi 2002-10-16 22:48:51 +03:00
parent 3476dc8f9e
commit 9ecc5783d6
4 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sql/item.cc
View File

@ -622,6 +622,28 @@ int Item_field::save_in_field(Field *to)
}
/*
Store null in field
SYNOPSIS
save_in_field()
field Field where we want to store NULL
DESCRIPTION
This is used on INSERT.
Allow NULL to be inserted in timestamp and auto_increment values
RETURN VALUES
0 ok
1 Field doesn't support NULL values and can't handle 'field = NULL'
*/
int Item_null::save_in_field(Field *field)
{
return set_field_to_null_with_conversions(field);
}
/*
Store null in field

4
sql/item.h
View File

@ -56,7 +56,7 @@ public:
virtual int save_in_field(Field *field);
virtual void save_org_in_field(Field *field)
{ (void) save_in_field(field); }
virtual bool save_safe_in_field(Field *field)
virtual int save_safe_in_field(Field *field)
{ return save_in_field(field); }
virtual bool send(THD *thd, String *str);
virtual bool eq(const Item *, bool binary_cmp) const;
@ -155,7 +155,7 @@ public:
longlong val_int();
String *val_str(String *str);
void make_field(Send_field *field);
int save_in_field(Field *field);
int save_in_field(Field *field);
int save_safe_in_field(Field *field);
enum Item_result result_type () const
{ return STRING_RESULT; }

1
sql/mysqld.cc
View File

@ -3323,7 +3323,6 @@ struct my_option my_long_options[] =
{"transaction-isolation", OPT_TX_ISOLATION,
"Default transaction isolation level", 0, 0, 0, GET_STR, REQUIRED_ARG, 0,
0, 0, 0, 0, 0},
0, 0, 0, 0, 0},
{"external-locking", OPT_USE_LOCKING, "Use system (external) locking. With this option enabled you can run myisamchk to test (not repair) tables while the MySQL server is running",
(gptr*) &opt_external_locking, (gptr*) &opt_external_locking,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

4
sql/sql_select.cc
View File

@ -976,8 +976,8 @@ JOIN::exec()
We can abort sorting after thd->select_limit rows if we there is no
WHERE clause for any tables after the sorted one.
*/
JOIN_TAB *table= &join_tab[join.const_tables+1];
JOIN_TAB *end_table= &join_tab[join.tables];
JOIN_TAB *table= &join_tab[const_tables+1];
JOIN_TAB *end_table= &join_tab[tables];
for (; table < end_table ; table++)
{
if (table->select_cond)