Commit 3ca99c4f authored by unknown's avatar unknown

Merge mysql.com:/home/ram/work/b26012/b26012.5.0

into  mysql.com:/home/ram/work/b26012/b26012.5.1


sql/field.h:
  Auto merged
parents 47045937 b591da53
...@@ -826,6 +826,7 @@ public: ...@@ -826,6 +826,7 @@ public:
uint32 pack_length() const { return sizeof(double); } uint32 pack_length() const { return sizeof(double); }
void sql_type(String &str) const; void sql_type(String &str) const;
uint32 max_length() { return 53; } uint32 max_length() { return 53; }
uint size_of() const { return sizeof(*this); }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment