Commit 6f6552e1 authored by unknown's avatar unknown

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqldump.c:
  Auto merged
parents c1a06748 72622734
...@@ -3432,7 +3432,7 @@ static my_bool get_view_structure(char *table, char* db) ...@@ -3432,7 +3432,7 @@ static my_bool get_view_structure(char *table, char* db)
result_table= quote_name(table, table_buff, 1); result_table= quote_name(table, table_buff, 1);
opt_quoted_table= quote_name(table, table_buff2, 0); opt_quoted_table= quote_name(table, table_buff2, 0);
snprintf(query, sizeof(query), "SHOW CREATE TABLE %s", result_table); my_snprintf(query, sizeof(query), "SHOW CREATE TABLE %s", result_table);
if (mysql_query_with_error_report(sock, &table_res, query)) if (mysql_query_with_error_report(sock, &table_res, query))
{ {
safe_exit(EX_MYSQLERR); safe_exit(EX_MYSQLERR);
...@@ -3475,7 +3475,7 @@ static my_bool get_view_structure(char *table, char* db) ...@@ -3475,7 +3475,7 @@ static my_bool get_view_structure(char *table, char* db)
} }
snprintf(query, sizeof(query), my_snprintf(query, sizeof(query),
"SELECT CHECK_OPTION, DEFINER, SECURITY_TYPE " \ "SELECT CHECK_OPTION, DEFINER, SECURITY_TYPE " \
"FROM information_schema.views " \ "FROM information_schema.views " \
"WHERE table_name=\"%s\" AND table_schema=\"%s\"", table, db); "WHERE table_name=\"%s\" AND table_schema=\"%s\"", table, db);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment