diff options
| author | unknown <monty@mishka.local> | 2004-10-20 02:55:03 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-10-20 02:55:03 +0300 |
| commit | 2da1cbd97dd566d629115f02321ab36aac069ce4 (patch) | |
| tree | 40c316b93bfec146a18945a7cd7813bcc5a5a179 /libmysql | |
| parent | ca1a24e0ad171272d2bcddcac737694af6c251a3 (diff) | |
| parent | 4736d0fe9963742e2788960d60da7f0f2dd593e9 (diff) | |
| download | mariadb-git-2da1cbd97dd566d629115f02321ab36aac069ce4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
client/mysqlimport.c:
Auto merged
libmysql/libmysql.c:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 10 | ||||
| -rw-r--r-- | libmysql/libmysql.def | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index ef926e2f93d..deb09c856ec 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1516,6 +1516,16 @@ uint STDCALL mysql_thread_safe(void) #endif } + +my_bool STDCALL mysql_embedded(void) +{ +#ifdef EMBEDDED_LIBRARY + return 1; +#else + return 0; +#endif +} + /**************************************************************************** Some support functions ****************************************************************************/ diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index 38ac9505e4b..bc91e90a41c 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -144,3 +144,4 @@ EXPORTS mysql_rpl_probe mysql_rpl_query_type mysql_slave_query + mysql_embedded |