diff options
| author | V S Murthy Sidagam <venkata.sidagam@oracle.com> | 2015-04-29 13:51:29 +0530 |
|---|---|---|
| committer | V S Murthy Sidagam <venkata.sidagam@oracle.com> | 2015-04-29 13:51:29 +0530 |
| commit | 31c803e8d0543b330aa8e61ef878da43fe1f68f7 (patch) | |
| tree | 4346b3a151be7b24bdc509991e5901740ce1925c /sql | |
| parent | c9a38e8698cfb9408e7bf28a75716eb91208ddbd (diff) | |
| download | mariadb-git-31c803e8d0543b330aa8e61ef878da43fe1f68f7.tar.gz | |
Bug #18592390 QUERY TO I_S.TABLES AND I_S.COLUMNS LEADS TO HUGE MEMORY USAGEmysql-5.5.44
As part of the fix find_files() prototype has been modified and
mysql-cluster uses find_files() function. Hence modified find_files() call
in ha_ndbcluster_binlog.cc file to make mysql-cluster build successful.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 15e0b068826..b921a5a6747 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. 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 @@ -2542,7 +2542,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); |