mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

after review fix(CRUM)

Browse source 
after merge fix
This commit is contained in:
bell@sanja.is.com.ua 2002-11-28 20:58:23 +02:00
parent fcb0b8815b
commit 65e27f604f
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/item.cc
View file

@ -497,15 +497,13 @@ bool Item_asterisk_remover::fix_fields(THD *thd,
thd->fatal_error= 1; // can't create Item => out of memory
}
else
my_message(ER_SUBSELECT_NO_1_COL, ER(ER_SUBSELECT_NO_1_COL),
MYF(0));
my_error(ER_CARDINALITY_COL, MYF(0), 1);
}
else
my_error(ER_BAD_TABLE_ERROR, MYF(0), fitem->table_name);
}
else
my_message(ER_SUBSELECT_NO_1_COL, ER(ER_SUBSELECT_NO_1_COL),
MYF(0));
my_error(ER_CARDINALITY_COL, MYF(0), 1);
else
my_error(ER_NO_TABLES_USED, MYF(0));
}

3
sql/item_cmpfunc.cc
View file

@ -129,7 +129,8 @@ void Item_bool_func2::fix_length_and_dec()
int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type)
{
owner= item;
func= comparator_matrix[type][owner->equal];
func= comparator_matrix[type][(owner->functype() == Item_func::EQUAL_FUNC)?
1:0];
if (type == ROW_RESULT)
{
uint n= args[0]->cols();

5
sql/item_cmpfunc.h
View file

@ -34,9 +34,8 @@ class Item_bool_func2 :public Item_int_func
{ /* Bool with 2 string args */
protected:
String tmp_value1,tmp_value2;
bool equal;
public:
Item_bool_func2(Item *a,Item *b) :Item_int_func(a,b), equal(0) {}
Item_bool_func2(Item *a,Item *b) :Item_int_func(a,b) {}
void fix_length_and_dec();
void set_cmp_func()
{
@ -89,7 +88,7 @@ public:
class Item_func_equal :public Item_bool_rowready_func2
{
public:
Item_func_equal(Item *a,Item *b) :Item_bool_rowready_func2(a,b) { equal=1; };
Item_func_equal(Item *a,Item *b) :Item_bool_rowready_func2(a,b) {};
longlong val_int();
void fix_length_and_dec();
enum Functype functype() const { return EQUAL_FUNC; }