diff options
| author | unknown <monty@mysql.com> | 2004-06-02 00:09:14 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-02 00:09:14 +0300 |
| commit | 5bf17d04f556c370de6a3567efccbe35baf35d37 (patch) | |
| tree | 7c47751643d7b2719fbee614235acaf2653f1d2a /include/mysql.h | |
| parent | ce0d015384d65199c3e0f830aa4f49937285e12b (diff) | |
| parent | 1a36eff30c4f661081d0943e2c764a0c1807acaf (diff) | |
| download | mariadb-git-5bf17d04f556c370de6a3567efccbe35baf35d37.tar.gz | |
Merge with 4.0 to get fixes for netware
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/README:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysys/mf_wcomp.c:
Auto merged
mysys/mf_wfile.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
configure.in:
Get changes for netware
include/my_sys.h:
Use local file
innobase/include/os0file.h:
auto merge
innobase/os/os0file.c:
auto merge
sql/mysqld.cc:
auto merge
sql/sql_acl.cc:
indentation change
sql/sql_acl.h:
use local file
sql/sql_class.h:
auto merge
sql/sql_db.cc:
use local file
sql/sql_parse.cc:
use local file
sql/sql_select.cc:
Merge
sql/sql_show.cc:
use local file
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index ad85bcc1bbd..e2d0acd7839 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -336,7 +336,7 @@ typedef struct st_mysql_parameters int STDCALL mysql_server_init(int argc, char **argv, char **groups); void STDCALL mysql_server_end(void); -MYSQL_PARAMETERS *STDCALL mysql_get_parameters(); +MYSQL_PARAMETERS *STDCALL mysql_get_parameters(void); /* Set up and bring down a thread; these function should be called |