diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-10-11 16:49:59 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-10-11 16:49:59 -0400 |
| commit | 21e525c5aea5618387ad968e878b7aef076b0747 (patch) | |
| tree | be0a74988ae2a39ac3c1d5faddb39b5954a3e0fb /sql/sql_view.h | |
| parent | 247f85f7edc611e4659c2378492fd4474f08f0f6 (diff) | |
| parent | 25393e391be033a1f32b11f4ea1405f427930725 (diff) | |
| download | mariadb-git-21e525c5aea5618387ad968e878b7aef076b0747.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my51
BitKeeper/deleted/.del-collapsed~66d21d0d6c19df3d:
Delete: BitKeeper/etc/collapsed
BitKeeper/etc/collapsed:
'Auto converge'
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/sql_parse.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
sql/sql_view.cc:
Manual merge.
vio/viosocket.c:
Manual merge.
Diffstat (limited to 'sql/sql_view.h')
| -rw-r--r-- | sql/sql_view.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_view.h b/sql/sql_view.h index 7e54d57cfdf..fc480167216 100644 --- a/sql/sql_view.h +++ b/sql/sql_view.h @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -bool mysql_create_view(THD *thd, +bool mysql_create_view(THD *thd, TABLE_LIST *view, enum_view_create_mode mode); bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, |