summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorjoerg@trift2. <>2007-06-18 20:22:18 +0200
committerjoerg@trift2. <>2007-06-18 20:22:18 +0200
commit4f6b3d107bca9174b286d93af8b440061254b0a3 (patch)
tree90b1bfdacd00ba4cb78c070fcfa948a001dea814 /libmysqld
parent674675a70c6817c0713fecd204b4aef85b2ddb6d (diff)
parentcf95b9e40e5cde1960139ff08a3340fda9071385 (diff)
downloadmariadb-git-4f6b3d107bca9174b286d93af8b440061254b0a3.tar.gz
Merge trift2.:/MySQL/M50/push-5.0
into trift2.:/MySQL/M51/push-5.1
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/libmysqld.def4
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