diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-06-11 15:57:59 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-06-11 15:57:59 -0600 |
| commit | 9ab7ce8dcba5f1a34eac9b2be468d511dd666542 (patch) | |
| tree | 727483fa8379480249287861113bba713dc46a69 /sql/sql_lex.cc | |
| parent | 73016f8f90edecb433e7ebbf09f0b261c19dce84 (diff) | |
| parent | 621d54fe4a33b5f8c51f0504ecdb1aa82044737b (diff) | |
| download | mariadb-git-9ab7ce8dcba5f1a34eac9b2be468d511dd666542.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 44768dd6d79..f169f2d3c4a 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1135,7 +1135,7 @@ Alter_info::Alter_info(const Alter_info &rhs, MEM_ROOT *mem_root) /* Make deep copies of used objects. This is not a fully deep copy - clone() implementations - of Alter_drop, Alter_column, Key, foreign_key, key_part_spec + of Alter_drop, Alter_column, Key, foreign_key, Key_part_spec do not copy string constants. At the same length the only reason we make a copy currently is that ALTER/CREATE TABLE code changes input Alter_info definitions, but string |