Commit 5415dcf4 authored by cmiller@zippy.cornsilk.net's avatar cmiller@zippy.cornsilk.net

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
parents 6cb1e2d6 4d8e38a6
...@@ -164,3 +164,4 @@ EXPORTS ...@@ -164,3 +164,4 @@ EXPORTS
my_charset_bin my_charset_bin
my_charset_same my_charset_same
modify_defaults_file modify_defaults_file
mysql_set_server_option
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