From 2722a28691d55a9352794dcca5565ebec56c901b Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Mar 2005 16:47:35 -0600 Subject: [PATCH] Bug #6660 mysqldump creates bad pathnames on Windows This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows. However, this patch fixes the bug in mysqldump.c mysqldump.c: Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows client/mysqldump.c: Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted --- BitKeeper/etc/logging_ok | 1 + client/mysqldump.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f64d9ca4042..8a0c32e37d1 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -190,6 +190,7 @@ ramil@mysql.com ranger@regul.home.lan rburnett@build.mysql.com reggie@bob.(none) +reggie@mdk10.(none) root@home.(none) root@mc04.(none) root@x3.internalnet diff --git a/client/mysqldump.c b/client/mysqldump.c index a53dc319b2e..5ac5efb5128 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1080,6 +1080,27 @@ static void print_xml_row(FILE *xml_file, const char *row_name, check_io(xml_file); } + +/* fixPaths -- on Windows only, this function will iterate through the output + of show create table and change any \ characters that appear in the data directory + or index directory elements to be / + + RETURN + void +*/ +static void fixPaths(char *buf, int buflen) +{ +#ifdef __WIN__ + int i = 0; + for (i=0; i < buflen; i++) + { + if (buf[i] != '\\') continue; + if (i != 0 && buf[i-1] == '\\') continue; + if (i != (buflen-1) && buf[i+1] == '\\') continue; + buf[i] = '/';} +#endif +} + /* getStructure -- retrievs database structure, prints out corresponding CREATE statement and fills out insert_pat. @@ -1159,6 +1180,7 @@ static uint getTableStructure(char *table, char* db) tableRes=mysql_store_result(sock); row=mysql_fetch_row(tableRes); + fixPaths(row[1], strlen(row[1])); // this really only does something on Windows fprintf(sql_file, "%s;\n", row[1]); check_io(sql_file); mysql_free_result(tableRes);