Commit 35044344 authored by unknown's avatar unknown

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
parents 1140898b 06754b9a
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment