database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-25 13:42:52 +03:00
Code

item.cc, insert_update.result:

Browse Source 
After merge fix.


mysql-test/r/insert_update.result:
  After merge fix.
sql/item.cc:
  After merge fix.
This commit is contained in:
unknown 2007-03-31 02:57:26 +04:00
parent da11d8177e
commit f92433ae13
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/insert_update.result
View File

@ -315,7 +315,7 @@ INSERT IGNORE INTO t1 (f1) VALUES ("test1"),("test4")
ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id); ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id);
SELECT LAST_INSERT_ID(); SELECT LAST_INSERT_ID();
LAST_INSERT_ID() LAST_INSERT_ID()
1 2
SELECT * FROM t1; SELECT * FROM t1;
id f1 id f1
1 test1 1 test1

2
sql/item.cc
View File

@ -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); field= new Field_blob(max_length, maybe_null, name, collation.collation);
break; // Blob handled outside of case break; // Blob handled outside of case
case MYSQL_TYPE_GEOMETRY: 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) (Field::geometry_type)
((Item_geometry_func *)this)->get_geometry_type()); ((Item_geometry_func *)this)->get_geometry_type());
} }