diff options
| author | unknown <kostja@bodhi.local> | 2006-12-12 01:23:30 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-12-12 01:23:30 +0300 |
| commit | 3e3990433a0c8ec7cea01274909fdb17024519e8 (patch) | |
| tree | 3a662cb0552120a80c60d29abb3b2f97c9d177b2 /sql/sql_insert.cc | |
| parent | fe84b016e1fd62d92c9f13a1e21784ea8cb200cd (diff) | |
| parent | e47ded8114f0b692a2ecf010998edcad46e6c2b3 (diff) | |
| download | mariadb-git-3e3990433a0c8ec7cea01274909fdb17024519e8.tar.gz | |
Merge bodhi.local:/opt/local/work/mysql-4.1-4968
into bodhi.local:/opt/local/work/mysql-5.0-4968-pull-from-4.1
sql/sql_insert.cc:
Auto merged
mysql-test/r/ps.result:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/sql_class.h:
Manual merge.
sql/sql_lex.cc:
Manual merge.
sql/sql_lex.h:
Manual merge.
sql/sql_list.h:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 2ce83caa369..79e91dc4cb1 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -2764,7 +2764,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u) unit= u; table= create_table_from_items(thd, create_info, create_table, - extra_fields, keys, &values, &lock); + alter_info, &values, &lock); if (!table) DBUG_RETURN(-1); // abort() deletes table |