diff options
| author | unknown <joerg@trift2.> | 2007-06-18 20:22:18 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-06-18 20:22:18 +0200 |
| commit | 35044344b26901ff497ddd882b4788aacee5d275 (patch) | |
| tree | 90b1bfdacd00ba4cb78c070fcfa948a001dea814 /libmysqld/libmysqld.def | |
| parent | 1140898b32f91ccee38585ccb3b026455c41943c (diff) | |
| parent | 06754b9a11ec20ed37ee78d9ba6ffb86e6ebeb70 (diff) | |
| download | mariadb-git-35044344b26901ff497ddd882b4788aacee5d275.tar.gz | |
Merge trift2.:/MySQL/M50/push-5.0
into trift2.:/MySQL/M51/push-5.1
libmysqld/libmysqld.def:
Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
Auto merged
BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c:
Auto merged
Diffstat (limited to 'libmysqld/libmysqld.def')
| -rw-r--r-- | libmysqld/libmysqld.def | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def index 21e61da15a7..c1025cd3846 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -30,8 +30,8 @@ EXPORTS my_print_variables my_realloc my_strdup - my_thread_end - my_thread_init + mysql_thread_end + mysql_thread_init myodbc_remove_escape mysql_affected_rows mysql_autocommit |