diff options
| author | unknown <joerg@trift2.> | 2007-06-18 19:44:58 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-06-18 19:44:58 +0200 |
| commit | 06754b9a11ec20ed37ee78d9ba6ffb86e6ebeb70 (patch) | |
| tree | b47602f30360e901d69cbc9bde907324187b5a4c /libmysqld/libmysqld.def | |
| parent | 4831826c694d5169764eb75fb246c0cb6f0f7a99 (diff) | |
| parent | 059b70d428e2b7e868761a09f178bc57eb32fdca (diff) | |
| download | mariadb-git-06754b9a11ec20ed37ee78d9ba6ffb86e6ebeb70.tar.gz | |
Merge trift2.:/MySQL/M41/push-4.1
into trift2.:/MySQL/M50/push-5.0
libmysqld/libmysqld.def:
Auto merged
VC++Files/mysql.sln:
Fix for "vio" seems not to be applicable in 5.0.
VC++Files/mysqldemb/mysqldemb.vcproj:
5.0 differs too much from 4.1 to merge this up,
also in 5.0 we use "cmake" now.
VC++Files/sql/mysqld.vcproj:
The fix in 4.1 was a backport, no use to merge it upwards.
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 0e80681700f..8829112fefd 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -29,8 +29,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 |