diff options
| author | serg@serg.mylan <> | 2004-02-13 15:30:00 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-02-13 15:30:00 +0100 |
| commit | 01c2ca5b8adbb6ad86defe286c294ff43ba864cb (patch) | |
| tree | b18d35bd6d44eca9b87d18a27bf8c62a767396fa /mysys | |
| parent | d0b456fead3ea73a9b60d2dbc2fd903e8e62508b (diff) | |
| parent | 26c7003e377609dd0aec79690793f6e390c8f8d5 (diff) | |
| download | mariadb-git-01c2ca5b8adbb6ad86defe286c294ff43ba864cb.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_keycache.c | 4 | ||||
| -rw-r--r-- | mysys/my_new.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 08737221fb2..52b7f153e0d 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -627,7 +627,7 @@ writes: %ld r_requests: %ld reads: %ld", a pointer to the last element. */ -static inline void link_into_queue(KEYCACHE_WQUEUE *wqueue, +static void link_into_queue(KEYCACHE_WQUEUE *wqueue, struct st_my_thread_var *thread) { struct st_my_thread_var *last; @@ -662,7 +662,7 @@ static inline void link_into_queue(KEYCACHE_WQUEUE *wqueue, See NOTES for link_into_queue */ -static inline void unlink_from_queue(KEYCACHE_WQUEUE *wqueue, +static void unlink_from_queue(KEYCACHE_WQUEUE *wqueue, struct st_my_thread_var *thread) { KEYCACHE_DBUG_PRINT("unlink_from_queue", ("thread %ld", thread->id)); diff --git a/mysys/my_new.cc b/mysys/my_new.cc index ec27502d8aa..14423c3afd5 100644 --- a/mysys/my_new.cc +++ b/mysys/my_new.cc @@ -19,10 +19,10 @@ with gcc 3.0.x to avoid including libstdc++ */ -#ifdef USE_MYSYS_NEW - #include "mysys_priv.h" +#ifdef USE_MYSYS_NEW + void *operator new (size_t sz) { return (void *) malloc (sz ? sz : 1); |