1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mdk10.(none):/home/reggie/bk/mysql-4.1
This commit is contained in:
reggie@mdk10.(none) 2005-03-15 11:37:14 -06:00
commit ef86c0af65
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@ -190,6 +190,7 @@ ramil@mysql.com
ranger@regul.home.lan ranger@regul.home.lan
rburnett@build.mysql.com rburnett@build.mysql.com
reggie@bob.(none) reggie@bob.(none)
reggie@mdk10.(none)
root@home.(none) root@home.(none)
root@mc04.(none) root@mc04.(none)
root@x3.internalnet root@x3.internalnet

1
client/mysqldump.c
View File

@ -1080,6 +1080,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name,
check_io(xml_file); check_io(xml_file);
} }
/* /*
getStructure -- retrievs database structure, prints out corresponding getStructure -- retrievs database structure, prints out corresponding
CREATE statement and fills out insert_pat. CREATE statement and fills out insert_pat.

9
sql/sql_show.cc
View File

@ -1227,7 +1227,16 @@ static void append_directory(THD *thd, String *packet, const char *dir_type,
packet->append(' '); packet->append(' ');
packet->append(dir_type); packet->append(dir_type);
packet->append(" DIRECTORY='", 12); 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); packet->append(filename, length);
#endif
packet->append('\''); packet->append('\'');
} }
} }