diff options
| author | hf@genie.(none) <> | 2002-10-07 15:38:07 +0500 |
|---|---|---|
| committer | hf@genie.(none) <> | 2002-10-07 15:38:07 +0500 |
| commit | 55866b061558d13d40f56097ab0bfbbd23e6bf83 (patch) | |
| tree | fbfc224eeed4a74ac5f2b5ede3bfe93330151a2d /sql/sql_parse.cc | |
| parent | 23de67efae0d91e36da5a2de0bbe86ac58f938c7 (diff) | |
| parent | 71d0f48f1f927fbe49d2d1b83f66aa55e973bf2d (diff) | |
| download | mariadb-git-55866b061558d13d40f56097ab0bfbbd23e6bf83.tar.gz | |
Huge pull
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7902e66043d..595df6b7b7d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -839,8 +839,9 @@ err: } - /* Execute one command from socket (query or simple command) */ +#ifndef EMBEDDED_LIBRARY + /* Execute one command from socket (query or simple command) */ bool do_command(THD *thd) { char *packet; @@ -879,6 +880,7 @@ bool do_command(THD *thd) DBUG_RETURN(dispatch_command(command,thd, packet+1, (uint) packet_length)); } +#endif /* EMBEDDED_LIBRARY */ bool dispatch_command(enum enum_server_command command, THD *thd, char* packet, uint packet_length) @@ -3195,7 +3197,6 @@ bool add_field_to_list(char *field_name, enum_field_types type, case FIELD_TYPE_STRING: case FIELD_TYPE_VAR_STRING: case FIELD_TYPE_NULL: - case FIELD_TYPE_GEOMETRY: break; case FIELD_TYPE_DECIMAL: if (!length) @@ -3208,6 +3209,7 @@ bool add_field_to_list(char *field_name, enum_field_types type, case FIELD_TYPE_TINY_BLOB: case FIELD_TYPE_LONG_BLOB: case FIELD_TYPE_MEDIUM_BLOB: + case FIELD_TYPE_GEOMETRY: if (default_value) // Allow empty as default value { String str,*res; @@ -3343,7 +3345,7 @@ bool add_field_to_list(char *field_name, enum_field_types type, if (new_field->length >= MAX_FIELD_WIDTH || (!new_field->length && !(new_field->flags & BLOB_FLAG) && - type != FIELD_TYPE_STRING && type != FIELD_TYPE_VAR_STRING)) + type != FIELD_TYPE_STRING && type != FIELD_TYPE_VAR_STRING && type != FIELD_TYPE_GEOMETRY)) { net_printf(thd,ER_TOO_BIG_FIELDLENGTH,field_name, MAX_FIELD_WIDTH-1); /* purecov: inspected */ |