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

Merge tag 'mysql-5.5.44' into bb-5.5-serg

Browse source
This commit is contained in:
Sergei Golubchik 2015-06-05 02:06:51 +02:00
commit f84f577aa1
27 changed files with 233 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/ha_ndbcluster_binlog.cc
View file

@ -1,5 +1,4 @@
/* Copyright (c) 2006, 2013, Oracle and/or its affiliates.
Copyright (c) 2012, 2013, Monty Proram Ab.
/* Copyright (c) 2006, 2015, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -2530,7 +2529,8 @@ ndbcluster_check_if_local_tables_in_db(THD *thd, const char *dbname)
char path[FN_REFLEN + 1];
build_table_filename(path, sizeof(path) - 1, dbname, "", "", 0);
if (find_files(thd, &files, dbname, path, NullS, 0) != FIND_FILES_OK)
if (find_files(thd, &files, dbname, path, NullS, 0, NULL) !=
FIND_FILES_OK)
{
DBUG_PRINT("info", ("Failed to find files"));
DBUG_RETURN(true);