diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /extra/libevent/event.c | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'extra/libevent/event.c')
| -rw-r--r-- | extra/libevent/event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/libevent/event.c b/extra/libevent/event.c index 2042c2de626..07498c709c8 100644 --- a/extra/libevent/event.c +++ b/extra/libevent/event.c @@ -405,7 +405,7 @@ event_loopexit_cb(int fd __attribute__((unused)), int event_loopexit(struct timeval *tv) { - return (event_once(-1, EV_TIMEOUT, event_loopexit_cb, + return (event_once(-1, EV_TIMEOUT, &event_loopexit_cb, current_base, tv)); } |