diff options
| author | unknown <rburnett@production.mysql.com> | 2006-09-06 18:27:26 +0200 |
|---|---|---|
| committer | unknown <rburnett@production.mysql.com> | 2006-09-06 18:27:26 +0200 |
| commit | 452a885e1f68d2c3b364538ce9f81fd655bcf43f (patch) | |
| tree | 08399387f35eaea892ae7b84bed1e8a045d78d0e /libmysqld | |
| parent | bc3122a9f8c9fc384361210df0282883d5073a1f (diff) | |
| parent | 3f4964394c0f3bb75a4c02549b70b728aa1ddd90 (diff) | |
| download | mariadb-git-452a885e1f68d2c3b364538ce9f81fd655bcf43f.tar.gz | |
Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2
into production.mysql.com:/usersnfs/rburnett/mysql-5.1
libmysqld/libmysqld.def:
Auto merged
mysql-test/t/handler.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/libmysqld.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def index 0d7eae9cade..6f7800ee207 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -164,3 +164,4 @@ EXPORTS my_charset_bin my_charset_same modify_defaults_file + mysql_set_server_option |