diff options
| author | unknown <reggie@mdk10.(none)> | 2005-05-23 12:05:15 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-05-23 12:05:15 -0500 |
| commit | 36b3f0a0529ab92fdedcbdefa7d1686b61f90429 (patch) | |
| tree | 3c59f5c05e59aa01beb0093d7df7dda41ec2a49d /sql/ha_myisammrg.cc | |
| parent | 6b964f0f102efb51c761091a4ee8f715604fb78a (diff) | |
| download | mariadb-git-36b3f0a0529ab92fdedcbdefa7d1686b61f90429.tar.gz | |
BUG# 10687: Merge engine fails under Windows
This cset is to roll out the cset applied earlier from Ingo.
This bug has been fixed with a different cset.
sql/ha_myisammrg.cc:
removed the patch applied earlier
strings/my_vsnprintf.c:
removed the patch applied earlier. The patch was to add %c ability.
Monty has already done this.
Diffstat (limited to 'sql/ha_myisammrg.cc')
| -rw-r--r-- | sql/ha_myisammrg.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 1bf2f8a31ad..9270361980f 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -406,8 +406,8 @@ 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%c%s/%s", mysql_data_home, - FN_LIBCHAR, tables->db, tables->real_name); + 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, we use the table name without a path. This means that the |