mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into mdk10.(none):/home/reggie/bk/mysql-5.0
This commit is contained in:
commit
4db638f371
2 changed files with 9 additions and 0 deletions
|
@ -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.
|
||||
|
|
|
@ -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('\'');
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue