diff options
| author | unknown <reggie@mdk10.(none)> | 2005-03-15 16:34:14 -0600 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-03-15 16:34:14 -0600 |
| commit | 4db638f371d2ac7720b435bfab3c148f74655c87 (patch) | |
| tree | 5010910b59e292e08239bc3f7520eb1c33db9a3b | |
| parent | 4421c4a5ebd0c51a582618d6d86b021c25e007a6 (diff) | |
| parent | 799e45226f33bb0932a67fc8f7563ee07d92021e (diff) | |
| download | mariadb-git-4db638f371d2ac7720b435bfab3c148f74655c87.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into mdk10.(none):/home/reggie/bk/mysql-5.0
| -rw-r--r-- | client/mysqldump.c | 1 | ||||
| -rw-r--r-- | sql/sql_show.cc | 8 |
2 files changed, 9 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..e0fc570015d 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -703,7 +703,15 @@ 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 = thd->memdup(filename, length); + for (uint i=0; i < length; i++) + if (winfilename[i] == '\\') + winfilename[i] = '/'; + packet->append(winfilename, length); +#else packet->append(filename, length); +#endif packet->append('\''); } } |