mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
SCRUM
embedded library trimming include/my_global.h: HAVE_REPLICATION & HAVE_EXTERNAL_CLIENT macro definitions libmysqld/lib_sql.cc: Protocol:: methods implementation for embedded case sql/field.cc: geometry type methods implementations sql/ha_berkeley.cc: set_nfields deletion sql/ha_innodb.cc: macro changed sql/ha_myisam.cc: set_nfields deletion sql/ha_myisam.h: code #ifdef-ed sql/item.cc: bugfix sql/item_func.cc: macro changed sql/item_strfunc.cc: superfluous code deleted sql/log.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/log_event.cc: #ifdef constructions changed sql/log_event.h: #ifdef-s changed sql/mf_iocache.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/mini_client.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/mysql_priv.h: code removation sql/mysqld.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/opt_range.cc: code trimming sql/protocol.cc: net_store_data becomes a member of Protocol sql/protocol.h: changes to make Protocol working in embedded library sql/repl_failsafe.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/repl_failsafe.h: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/set_var.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/slave.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/slave.h: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/sql_parse.cc: code trimming sql/sql_prepare.cc: comment added sql/sql_repl.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/sql_repl.h: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/sql_show.cc: mysql_list_processes to work in embedded library sql/sql_table.cc: set_nfields deletion
This commit is contained in:
10
sql/field.cc
10
sql/field.cc
@@ -4586,7 +4586,7 @@ void Field_blob::set_key_image(char *buff,uint length)
|
||||
|
||||
void Field_geom::get_key_image(char *buff,uint length, imagetype type)
|
||||
{
|
||||
/* length-=HA_KEY_BLOB_LENGTH;
|
||||
length-=HA_KEY_BLOB_LENGTH;
|
||||
ulong blob_length=get_length(ptr);
|
||||
char *blob;
|
||||
get_ptr(&blob);
|
||||
@@ -4601,8 +4601,6 @@ void Field_geom::get_key_image(char *buff,uint length, imagetype type)
|
||||
float8store(buff+16, mbr.ymin);
|
||||
float8store(buff+24, mbr.ymax);
|
||||
return;
|
||||
*/
|
||||
Field_blob::get_key_image(buff, length, type);
|
||||
}
|
||||
|
||||
void Field_geom::set_key_image(char *buff,uint length)
|
||||
@@ -4612,7 +4610,7 @@ void Field_geom::set_key_image(char *buff,uint length)
|
||||
|
||||
void Field_geom::sql_type(String &res) const
|
||||
{
|
||||
res.set("geometry", 8U, default_charset_info);
|
||||
res.set("geometry", 8, default_charset_info);
|
||||
}
|
||||
|
||||
int Field_blob::key_cmp(const byte *key_ptr, uint max_key_length)
|
||||
@@ -5255,10 +5253,10 @@ uint32 calc_pack_length(enum_field_types type,uint32 length)
|
||||
case FIELD_TYPE_LONGLONG: return 8; /* Don't crash if no longlong */
|
||||
case FIELD_TYPE_NULL : return 0;
|
||||
case FIELD_TYPE_TINY_BLOB: return 1+portable_sizeof_char_ptr;
|
||||
case FIELD_TYPE_BLOB: return 2+portable_sizeof_char_ptr;
|
||||
case FIELD_TYPE_BLOB:
|
||||
case FIELD_TYPE_GEOMETRY: return 2+portable_sizeof_char_ptr;
|
||||
case FIELD_TYPE_MEDIUM_BLOB: return 3+portable_sizeof_char_ptr;
|
||||
case FIELD_TYPE_LONG_BLOB: return 4+portable_sizeof_char_ptr;
|
||||
case FIELD_TYPE_GEOMETRY: return 2+portable_sizeof_char_ptr;
|
||||
case FIELD_TYPE_SET:
|
||||
case FIELD_TYPE_ENUM: abort(); return 0; // This shouldn't happen
|
||||
default: return 0;
|
||||
|
||||
Reference in New Issue
Block a user