diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-09-11 20:24:14 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-09-11 20:24:14 +0300 |
| commit | d32bdcb1bfc274476cdd945e66e00f3ec31253c3 (patch) | |
| tree | 20f0ccc7be8e0d205ea5a00d6ec5f57a14d85d3f /include | |
| parent | dd0d199ebeab47facb4d01269cda97c258491c22 (diff) | |
| parent | 3f6d78f6c7ad5eb00c4d24b0f0b839a1fb1ead25 (diff) | |
| download | mariadb-git-d32bdcb1bfc274476cdd945e66e00f3ec31253c3.tar.gz | |
merge with 4.0.15
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
Delete: scripts/mysql_fix_privilege_tables.sql
include/mysql.h:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_update.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/bdb.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/range.test:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h index 55fe4107d0c..24afa9a29ba 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -619,6 +619,8 @@ int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB); unsigned long net_safe_read(MYSQL* mysql); void mysql_once_init(void); +extern my_bool server_inited; + #ifdef __NETWARE__ #pragma pack(pop) /* restore alignment */ #endif |