database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
This commit is contained in:
ingo@production.mysql.com
2005-11-08 20:18:08 +01:00
parent 63554e10d8 7533d92b23
commit cae673d0a9
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/field.cc
View File

@@ -6202,9 +6202,16 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table)
This is done to ensure that ALTER TABLE will convert old VARCHAR fields This is done to ensure that ALTER TABLE will convert old VARCHAR fields
to now VARCHAR fields. to now VARCHAR fields.
*/ */
return new Field_varstring(field_length, maybe_null(), Field *new_field= new Field_varstring(field_length, maybe_null(),
field_name, new_table, field_name, new_table,
charset()); charset());
/*
delayed_insert::get_local_table() needs a ptr copied from old table.
This is what other new_field() methods do too. The above method of
Field_varstring sets ptr to NULL.
*/
new_field->ptr= ptr;
return new_field;
} }
/**************************************************************************** /****************************************************************************