database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge polly.local:/tmp/maint/bug24117/my51-bug24117

Browse Source 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/typelib.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
This commit is contained in:
unknown
2006-12-15 13:23:05 +03:00
parent 501f92474e 3863e8d643
commit 36c0cc54b3
6 changed files with 105 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/field.h
View File

@@ -1354,6 +1354,7 @@ public:
{
flags|=ENUM_FLAG;
}
Field *new_field(MEM_ROOT *root, struct st_table *new_table, bool keep_type);
enum_field_types type() const { return FIELD_TYPE_STRING; }
enum Item_result cmp_type () const { return INT_RESULT; }
enum Item_result cast_to_int_type () const { return INT_RESULT; }