Commit f92433ae authored by unknown's avatar unknown
Browse files

item.cc, insert_update.result: 

  After merge fix.


mysql-test/r/insert_update.result:
  After merge fix.
sql/item.cc:
  After merge fix.
parent da11d817

mysql-test/r/insert_update.result

+1 −1
Original line number Diff line number Diff line
@@ -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

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -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());

  }