Commit 6a94bc51 authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


libmysqld/libmysqld.def:
  Auto merged
parents 5284bee2 22f6e651

libmysqld/libmysqld.def

+1 −0
Original line number Diff line number Diff line
@@ -164,3 +164,4 @@ EXPORTS 
	my_charset_bin

	my_charset_same

	modify_defaults_file

        mysql_set_server_option