diff options
| author | unknown <reggie@mdk10.(none)> | 2005-03-15 11:42:31 -0600 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-03-15 11:42:31 -0600 |
| commit | 4a49d3f3336007c1f8ceacf304cb963913c8a0a1 (patch) | |
| tree | 0edc3b832c4b3d72a8deef2b8086e0c52fb2b9ca | |
| parent | 268a3ecc8b6282ddbd082f7f133c7273b087576b (diff) | |
| parent | 822a46d593774c695d74f1af9366ce7e7632dd67 (diff) | |
| download | mariadb-git-4a49d3f3336007c1f8ceacf304cb963913c8a0a1.tar.gz | |
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
client/mysqldump.c:
Auto merged
sql/sql_show.cc:
Auto merged
| -rw-r--r-- | client/mysqldump.c | 1 | ||||
| -rw-r--r-- | sql/sql_show.cc | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 604c9ff8227..7d357b25541 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1084,6 +1084,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name, check_io(xml_file); } + /* getStructure -- retrievs database structure, prints out corresponding CREATE statement and fills out insert_pat. diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 4ffe7110cfa..0750ab89a21 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -703,7 +703,16 @@ static void append_directory(THD *thd, String *packet, const char *dir_type, packet->append(' '); packet->append(dir_type); packet->append(" DIRECTORY='", 12); +#ifdef __WIN__ + char *winfilename = strdup(filename); + for (uint i=0; i < length; i++) + if (winfilename[i] == '\\') + winfilename[i] = '/'; + packet->append(winfilename, length); + free(winfilename); +#else packet->append(filename, length); +#endif packet->append('\''); } } |