diff options
| author | unknown <reggie@mdk10.(none)> | 2005-03-15 11:37:14 -0600 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-03-15 11:37:14 -0600 |
| commit | 72e60a3b84c0db07c90de102a44bd04fb8125574 (patch) | |
| tree | cad2a15cb8309e2767317f56e30b76fdfdf6633b | |
| parent | 67a9d9e7582903c665591455286ce46047faf304 (diff) | |
| parent | c209d1128826cec3a153dd723049dcca6200d9a6 (diff) | |
| download | mariadb-git-72e60a3b84c0db07c90de102a44bd04fb8125574.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | client/mysqldump.c | 1 | ||||
| -rw-r--r-- | sql/sql_show.cc | 9 |
3 files changed, 11 insertions, 0 deletions
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..fa36ce0242d 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1080,6 +1080,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 8d741b4dc67..a85a6f92d70 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1227,7 +1227,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('\''); } } |