diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-07-19 10:27:53 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-07-19 10:27:53 +0200 |
| commit | 7467ee7bc60cb393d2f9ef905da88a0f1d3ffe50 (patch) | |
| tree | 6eedcafada6964accf0bd5b2e271a260a8d9db15 /storage/myisammrg | |
| parent | a6a8e10c799d093e13ec136b960703f9b657df74 (diff) | |
| parent | 917c33cfbf7feade67ae4d4d884870e8f96f822e (diff) | |
| download | mariadb-git-7467ee7bc60cb393d2f9ef905da88a0f1d3ffe50.tar.gz | |
merge from mysql-trunk-bugfixing
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r--[-rwxr-xr-x] | storage/myisammrg/CMakeLists.txt | 0 | ||||
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 5 | ||||
| -rw-r--r-- | storage/myisammrg/myrg_open.c | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/storage/myisammrg/CMakeLists.txt b/storage/myisammrg/CMakeLists.txt index 739bcd565bc..739bcd565bc 100755..100644 --- a/storage/myisammrg/CMakeLists.txt +++ b/storage/myisammrg/CMakeLists.txt diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 6e3047afb34..f41629ff882 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -299,9 +299,8 @@ extern "C" int myisammrg_parent_open_callback(void *callback_param, if (! db || ! table_name) DBUG_RETURN(1); - DBUG_PRINT("myrg", ("open: '%.*s'.'%.*s'", db_length, db, - table_name_length, table_name)); - + DBUG_PRINT("myrg", ("open: '%.*s'.'%.*s'", (int) db_length, db, + (int) table_name_length, table_name)); /* Convert to lowercase if required. */ if (lower_case_table_names && table_name_length) diff --git a/storage/myisammrg/myrg_open.c b/storage/myisammrg/myrg_open.c index e4793ffe672..c9e19d32e96 100644 --- a/storage/myisammrg/myrg_open.c +++ b/storage/myisammrg/myrg_open.c @@ -18,9 +18,6 @@ #include "myrg_def.h" #include <stddef.h> #include <errno.h> -#ifdef VMS -#include "mrg_static.c" -#endif /* open a MyISAM MERGE table |