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 abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into deer.(none):/home/hf/work/mysql-5.0.clean
This commit is contained in:
hf@deer.(none)
2005-02-09 02:54:08 +04:00
parent 2c26ebe359 b94a482ee9
commit 96558f6ad3
104 changed files with 9131 additions and 1730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_class.h
View File

@ -1521,6 +1521,7 @@ public:
bool send_data(List<Item> &items);
bool cmp_real();
bool cmp_int();
bool cmp_decimal();
bool cmp_str();
};
@ -1594,9 +1595,10 @@ class user_var_entry
ulong length, update_query_id, used_query_id;
Item_result type;
double val(my_bool *null_value);
double val_real(my_bool *null_value);
longlong val_int(my_bool *null_value);
String *val_str(my_bool *null_value, String *str, uint decimals);
my_decimal *val_decimal(my_bool *null_value, my_decimal *result);
DTCollation collation;
};
@ -1625,9 +1627,11 @@ public:
~Unique();
inline bool unique_add(void *ptr)
{
DBUG_ENTER("unique_add");
DBUG_PRINT("info", ("tree %u - %u", tree.elements_in_tree, max_elements));
if (tree.elements_in_tree > max_elements && flush())
return 1;
return !tree_insert(&tree, ptr, 0, tree.custom_arg);
DBUG_RETURN(1);
DBUG_RETURN(!tree_insert(&tree, ptr, 0, tree.custom_arg));
}
bool get(TABLE *table);