diff options
| author | unknown <reggie@mdk10.(none)> | 2005-05-23 12:31:22 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-05-23 12:31:22 -0500 |
| commit | 67c5514b908a6adfb0cd91dfe6dc9d0b0e21e1c1 (patch) | |
| tree | a8164dc0779d5dd4934de3f2c07f972675bccfb0 /sql/ha_myisammrg.cc | |
| parent | 1b2a2c8647752b4c004d97ca9b7f847b0ecddb91 (diff) | |
| download | mariadb-git-67c5514b908a6adfb0cd91dfe6dc9d0b0e21e1c1.tar.gz | |
BUG#10687 - Merge engine fails under Windows
This final cset is to fix a syntax problem in ha_myisammrg.cc where a / was left out of a format string.
It also adds a check in has_path to avoid a possible redundant comparison.
ha_myisammrg.cc:
Replaced missing / in format string
my_getwd.c:
Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison
mysys/my_getwd.c:
Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison
sql/ha_myisammrg.cc:
Replaced missing / in format string
Diffstat (limited to 'sql/ha_myisammrg.cc')
| -rw-r--r-- | sql/ha_myisammrg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 9270361980f..0b160d72aab 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -406,7 +406,7 @@ int ha_myisammrg::create(const char *name, register TABLE *form, This means that it might not be possible to move the DATADIR of an embedded server without changing the paths in the .MRG file. */ - uint length= my_snprintf(buff, FN_REFLEN, "%s%s/%s", mysql_data_home, + uint length= my_snprintf(buff, FN_REFLEN, "%s/%s/%s", mysql_data_home, tables->db, tables->real_name); /* If a MyISAM table is in the same directory as the MERGE table, |