diff options
| author | unknown <ingo@mysql.com> | 2005-03-04 09:35:21 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-03-04 09:35:21 +0100 |
| commit | f97fd0f0b7bd46ffa00ae2c94bb476efd6f94271 (patch) | |
| tree | 48f8d3fa507af24f9089a28333e7601a26e6e164 /sql/mysqld.cc | |
| parent | 9dd851bac4880a68c88764df24248f45df383725 (diff) | |
| parent | 555ea37d773e1e2345df5e6eea9f6d4e48432bd0 (diff) | |
| download | mariadb-git-f97fd0f0b7bd46ffa00ae2c94bb476efd6f94271.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.1-4100
myisam/mi_create.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d722dd5839c..fb9a1d70512 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4176,8 +4176,8 @@ struct my_option my_long_options[] = {"ansi", 'a', "Use ANSI SQL syntax instead of MySQL syntax. This mode will also set transaction isolation level 'serializable'.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"allow-suspicious-udfs", OPT_ALLOW_SUSPICIOUS_UDFS, - "Allows to use UDF's consisting of only one symbol xxx() " - "without corresponing xxx_init() or xxx_deinit(). That also means " + "Allows use of UDFs consisting of only one symbol xxx() " + "without corresponding xxx_init() or xxx_deinit(). That also means " "that one can load any function from any library, for example exit() " "from libc.so", (gptr*) &opt_allow_suspicious_udfs, (gptr*) &opt_allow_suspicious_udfs, |