database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

BUG# 10687: Merge engine fails under Windows

Browse Source 
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.
This commit is contained in:
unknown
2005-05-23 12:05:15 -05:00
parent 6b964f0f10
commit 36b3f0a052
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/ha_myisammrg.cc
View File

@ -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 This means that it might not be possible to move the DATADIR of
an embedded server without changing the paths in the .MRG file. 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, uint length= my_snprintf(buff, FN_REFLEN, "%s%s/%s", mysql_data_home,
FN_LIBCHAR, tables->db, tables->real_name); tables->db, tables->real_name);
/* /*
If a MyISAM table is in the same directory as the MERGE table, 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 we use the table name without a path. This means that the

6
strings/my_vsnprintf.c
View File

@ -28,7 +28,6 @@
%#[l]u %#[l]u
%#[l]x %#[l]x
%#.#s Note first # is ignored %#.#s Note first # is ignored
%c
RETURN RETURN
length of result string length of result string
@ -121,11 +120,6 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
to+= res_length; to+= res_length;
continue; continue;
} }
else if (*fmt == 'c')
{
*(to++)= (char) va_arg(ap, int);
continue;
}
/* We come here on '%%', unknown code or too long parameter */ /* We come here on '%%', unknown code or too long parameter */
if (to == end) if (to == end)
break; break;