diff options
author | unknown <schwenke@alpha.xl.local> | 2005-07-31 19:59:20 +0200 |
---|---|---|
committer | unknown <schwenke@alpha.xl.local> | 2005-07-31 19:59:20 +0200 |
commit | 35ca560d55728e0fc4647ee85a2b4efea3865260 (patch) | |
tree | 33b94ebd968fb2280e7b9918b9e43bf1faae321e /libmysql | |
parent | 3876861ea6faec0c063ff42c119927d220e43ce6 (diff) | |
parent | 4899150bd8ead7ee413cc01af04e64a1a2432f71 (diff) | |
download | mariadb-git-35ca560d55728e0fc4647ee85a2b4efea3865260.tar.gz |
Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0
into alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/libmysql.def | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index 5d8c2309063..a469c67c466 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -148,7 +148,6 @@ EXPORTS mysql_embedded mysql_server_init mysql_server_end - get_defaults_files mysql_set_character_set mysql_get_character_set_info get_defaults_options |