From 665e557533c707a8fc6d9ac66a8bd446682112c7 Mon Sep 17 00:00:00 2001
From: unknown <cmiller@zippy.cornsilk.net>
Date: Fri, 13 Oct 2006 10:57:50 -0400
Subject: Merge fix-up.
vio/viossl.c:
We prefer "0x%lx" to "%p".
---
sql/sql_view.cc | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
(limited to 'sql/sql_view.cc')
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index a3e0f6b1e5a..82acab7129e 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -573,6 +573,19 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
}
append_identifier(thd, &buff, views->table_name,
views->table_name_length);
+ if (lex->view_list.elements)
+ {
+ List_iterator_fast<LEX_STRING> names(lex->view_list);
+ LEX_STRING *name;
+ int i;
+
+ for (i= 0; name= names++; i++)
+ {
+ buff.append(i ? ", " : "(");
+ append_identifier(thd, &buff, name->str, name->length);
+ }
+ buff.append(')');
+ }
buff.append(STRING_WITH_LEN(" AS "));
buff.append(views->source.str, views->source.length);
@@ -1378,7 +1391,7 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
error= TRUE;
query_cache_invalidate3(thd, view, 0);
sp_cache_invalidate();
-
+ }
if (mysql_bin_log.is_open())
{
thd->clear_error();
--
cgit v1.2.1