mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge with MySQL 5.1.42

Browse source 
- Marked a couple of tests with --big
- Fixed xtradb/handler/ha_innodb.cc to call explain_filename()

storage/xtradb/handler/ha_innodb.cc:
  Call explain_filename() to get proper names for partitioned tables
This commit is contained in:
Michael Widenius 2010-01-15 17:27:55 +02:00
commit d8ecbbe634
254 changed files with 7302 additions and 1917 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mysys/my_getopt.c
View file

@ -414,17 +414,11 @@ invalid value '%s'",
(optp->var_type & GET_TYPE_MASK) == GET_ENUM))
{
if (optend == disabled_my_option)
if ((optp->var_type & GET_TYPE_MASK) == GET_BOOL)
*((my_bool*) value)= (my_bool) 0;
else
*((ulong*) value)= (ulong) 0;
init_one_value(optp, value, 0);
else
{
if (!optend) /* No argument -> enable option */
if ((optp->var_type & GET_TYPE_MASK) == GET_BOOL)
*((my_bool*) value)= (my_bool) 1;
else
*((ulong*) value)= (ulong) 1;
init_one_value(optp, value, 1);
else
argument= optend;
}

4
mysys/my_sync.c
View file

@ -104,11 +104,11 @@ int my_sync_dir(const char *dir_name __attribute__((unused)),
myf my_flags __attribute__((unused)))
{
#ifdef NEED_EXPLICIT_SYNC_DIR
DBUG_ENTER("my_sync_dir");
DBUG_PRINT("my",("Dir: '%s' my_flags: %d", dir_name, my_flags));
File dir_fd;
int res= 0;
const char *correct_dir_name;
DBUG_ENTER("my_sync_dir");
DBUG_PRINT("my",("Dir: '%s' my_flags: %d", dir_name, my_flags));
/* Sometimes the path does not contain an explicit directory */
correct_dir_name= (dir_name[0] == 0) ? cur_dir_name : dir_name;
/*