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

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into mysql.com:/home/my/mysql-4.1


sql/item.cc:
  Auto merged
This commit is contained in:
unknown 2004-04-12 01:43:07 +03:00
commit 97eddaaf6d
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sql/field.h
View file

@ -92,6 +92,7 @@ public:
utype unireg_check_arg, const char *field_name_arg,
struct st_table *table_arg);
virtual ~Field() {}
/* Store functions returns 1 on overflow and -1 on fatal error */
virtual int store(const char *to,uint length,CHARSET_INFO *cs)=0;
virtual int store(double nr)=0;
virtual int store(longlong nr)=0;

4
sql/item.cc
View file

@ -678,9 +678,7 @@ void Item_param::set_longdata(const char *str, ulong length)
int Item_param::save_in_field(Field *field, bool no_conversions)
{
THD *thd= current_thd;
DBUG_ASSERT(thd->command == COM_EXECUTE);
DBUG_ASSERT(current_thd->command == COM_EXECUTE);
if (null_value)
return (int) set_field_to_null(field);

1
sql/item.h
View file

@ -146,6 +146,7 @@ public:
complete fix_fields() procedure.
*/
inline void quick_fix_field() { fixed= 1; }
/* Function returns 1 on overflow and -1 on fatal errors */
virtual int save_in_field(Field *field, bool no_conversions);
virtual void save_org_in_field(Field *field)
{ (void) save_in_field(field, 1); }