diff options
| author | Chad MILLER <chad@mysql.com> | 2009-05-06 09:06:32 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-05-06 09:06:32 -0400 |
| commit | 767501a9b1c89e17986d8089131d935d63420ad7 (patch) | |
| tree | b7a5df1540af07a49f7d577804919b7027fc4edf /include | |
| parent | 6bee08c61dbb89837edc04de8e49fed411f17770 (diff) | |
| parent | 4822696ecb7302efc543e0be109f1c2a8f1bdf4e (diff) | |
| download | mariadb-git-767501a9b1c89e17986d8089131d935d63420ad7.tar.gz | |
Merge community up to enterprise, thus ending the community-server
adventure.
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 3 | ||||
| -rw-r--r-- | include/my_sys.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/config-win.h b/include/config-win.h index ab463a7c142..39affd3b8e9 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -206,6 +206,9 @@ typedef uint rf_SetTimer; /* If LOAD DATA LOCAL INFILE should be enabled by default */ #define ENABLED_LOCAL_INFILE 1 +/* If query profiling should be enabled by default */ +#define ENABLED_PROFILING 1 + /* Convert some simple functions to Posix */ #define my_sigset(A,B) signal((A),(B)) diff --git a/include/my_sys.h b/include/my_sys.h index 35c4eb5f2b1..bfb1a672641 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -162,6 +162,7 @@ extern char *my_strdup_with_length(const char *from, size_t length, #define ORIG_CALLER_INFO /* nothing */ #define TRASH(A,B) /* nothing */ #endif +#define my_strndup(A,B,C) my_strdup_with_length((A), (B), (C)) #ifdef HAVE_LARGE_PAGES extern uint my_get_large_page_size(void); |