database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

fix xml with view

Browse Source 
client/mysqldump.c:
  fixed XML output for view
mysql-test/r/mysqldump.result:
  mysqldump test
mysql-test/t/mysqldump.test:
  mysqldump test
sql/sql_base.cc:
  fix of LOCK workaround
This commit is contained in:
unknown
2004-09-26 19:00:55 +03:00
parent 66b4c82eac
commit 808f42d528
4 changed files with 84 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/mysqldump.c
View File

@ -1161,6 +1161,12 @@ static uint getTableStructure(char *table, char* db)
sprintf(buff,"show keys from %s", result_table);
if (mysql_query(sock, buff))
{
if (mysql_errno(sock) == ER_WRONG_OBJECT)
{
/* it is VIEW */
fputs("\t\t<options Comment=\"view\" />\n", sql_file);
goto continue_xml;
}
fprintf(stderr, "%s: Can't get keys for table %s (%s)\n",
my_progname, result_table, mysql_error(sock));
if (path)
@ -1268,6 +1274,7 @@ static uint getTableStructure(char *table, char* db)
}
mysql_free_result(tableRes); /* Is always safe to free */
}
continue_xml:
if (!opt_xml)
fputs(";\n", sql_file);
else
@ -2134,9 +2141,14 @@ static const char *check_if_ignore_table(const char *table_name)
mysql_free_result(res);
return 0; /* assume table is ok */
}
if (strcmp(row[1], (result= "MRG_MyISAM")) &&
strcmp(row[1], (result= "MRG_ISAM")))
result= 0;
if (!(row[1]))
result= "VIEW";
else
{
if (strcmp(row[1], (result= "MRG_MyISAM")) &&
strcmp(row[1], (result= "MRG_ISAM")))
result= 0;
}
mysql_free_result(res);
return result;
}