mirror of
https://github.com/MariaDB/server.git
synced 2026-04-23 00:35:32 +02:00
Merge lambda.weblab:/home/malff/TREE/mysql-5.1-base
into lambda.weblab:/home/malff/TREE/mysql-5.1-rt-merge mysql-test/include/mix1.inc: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/select.result: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/protocol.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged
This commit is contained in:
commit
f139033063
153 changed files with 3231 additions and 499 deletions
|
|
@ -2740,7 +2740,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
|
|||
}
|
||||
if (f_is_geom(sql_field->pack_flag) && sql_field->geom_type ==
|
||||
Field::GEOM_POINT)
|
||||
column->length= 21;
|
||||
column->length= 25;
|
||||
if (!column->length)
|
||||
{
|
||||
my_error(ER_BLOB_KEY_WITHOUT_LENGTH, MYF(0), column->field_name);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue