diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-06 02:04:52 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-06 02:04:52 +0200 |
| commit | 3378d694cd4f6ab781455679ec2201b45dbad598 (patch) | |
| tree | f66f929cc02cd3b110667183929f39e5bd2231a9 /tools | |
| parent | bf4a539265445905c899c7bd96a6e8969c0e6587 (diff) | |
| parent | 6cdba8731463a8d6c6c6c75603319937c026da7f (diff) | |
| download | mariadb-git-3378d694cd4f6ab781455679ec2201b45dbad598.tar.gz | |
Merge with 4.0.8
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
acinclude.m4:
Auto merged
include/mysql.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_test1.c:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/table.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mysqlmanager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c index 6a246f096c8..4f2deeb0052 100644 --- a/tools/mysqlmanager.c +++ b/tools/mysqlmanager.c @@ -1241,7 +1241,7 @@ static void handle_child(int __attribute__((unused)) sig) signal(SIGCHLD,handle_child); } -struct manager_thd* manager_thd_new(Vio* vio) +static struct manager_thd* manager_thd_new(Vio* vio) { struct manager_thd* tmp; if (!(tmp=(struct manager_thd*)my_malloc(sizeof(*tmp), |