diff options
| -rw-r--r-- | mysql-test/r/insert_update.result | 2 | ||||
| -rw-r--r-- | sql/item.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index ce0ec7025de..fed66ed47a7 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -315,7 +315,7 @@ INSERT IGNORE INTO t1 (f1) VALUES ("test1"),("test4") ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id); SELECT LAST_INSERT_ID(); LAST_INSERT_ID() -1 +2 SELECT * FROM t1; id f1 1 test1 diff --git a/sql/item.cc b/sql/item.cc index d4330710bbd..613b72ad05e 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4370,7 +4370,7 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table, bool fixed_length) field= new Field_blob(max_length, maybe_null, name, collation.collation); break; // Blob handled outside of case case MYSQL_TYPE_GEOMETRY: - return new Field_geom(max_length, maybe_null, name, table, + return new Field_geom(max_length, maybe_null, name, table->s, (Field::geometry_type) ((Item_geometry_func *)this)->get_geometry_type()); } |