summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <monty@tik.mysql.fi>2002-04-22 23:36:34 +0300
committerunknown <monty@tik.mysql.fi>2002-04-22 23:36:34 +0300
commitce79a892abfbc3faa90c79d4b4261e31103e8e8c (patch)
tree2d4a28547b1155c925db237f6e4cf79b0b3f8861 /libmysql
parent485c06e39f43811b54ed4c94379c8a3a9f0a049b (diff)
downloadmariadb-git-ce79a892abfbc3faa90c79d4b4261e31103e8e8c.tar.gz
Removed some old Makefiles to avoid name conflict on Mac OS X
Changed in client library character-set-dir -> character-sets-dir Docs/manual.texi: Snmall update to ALTER TABLE and MyISAM tables client/mysql.cc: Moved SSL info to 'status' libmysql/libmysql.c: Fixed character-set-dir -> character-sets-dir sql/sql_string.cc: Small optimization
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index f861f3c96c5..baa6f5a72f2 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -698,7 +698,7 @@ static const char *default_options[]=
"port","socket","compress","password","pipe", "timeout", "user",
"init-command", "host", "database", "debug", "return-found-rows",
"ssl-key" ,"ssl-cert" ,"ssl-ca" ,"ssl-capath",
- "character-set-dir", "default-character-set", "interactive-timeout",
+ "character-sets-dir", "default-character-set", "interactive-timeout",
"connect-timeout", "local-infile", "disable-local-infile",
"replication-probe", "enable-reads-from-master", "repl-parse-query",
"ssl-cipher",