summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalle@vafla.home <>2004-02-02 12:09:47 +0200
committersalle@vafla.home <>2004-02-02 12:09:47 +0200
commit5b9c62b6c317de88b24f97d541be63679a851713 (patch)
tree5ce9f05cc3fc1973a62eeb293ef4e2704cf038f8
parentbe760becac0d468a5f031ffac64475f0e9568901 (diff)
downloadmariadb-git-5b9c62b6c317de88b24f97d541be63679a851713.tar.gz
Typo fixing
s/expection/exception
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--sql/mysqld.cc4
2 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 5cf95b9fc2a..dae3ea521c3 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -98,6 +98,7 @@ ranger@regul.home.lan
root@x3.internalnet
salle@geopard.(none)
salle@geopard.online.bg
+salle@vafla.home
salle@vafla.online.bg
sasha@mysql.sashanet.com
serg@build.mysql2.com
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index b2b53e571c3..14db51cf6fd 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -140,7 +140,7 @@ int initgroups(const char *,unsigned int);
typedef fp_except fp_except_t;
#endif
- /* We can't handle floating point expections with threads, so disable
+ /* We can't handle floating point exceptions with threads, so disable
this on freebsd
*/
@@ -4044,7 +4044,7 @@ this value; if zero (the default): when the size exceeds max_binlog_size. \
(gptr*) &max_system_variables.range_alloc_block_size, 0, GET_ULONG,
REQUIRED_ARG, RANGE_ALLOC_BLOCK_SIZE, 1024, ~0L, 0, 1024, 0},
{"read-only", OPT_READONLY,
- "Make all tables readonly, with the expections for replications (slave) threads and users with the SUPER privilege",
+ "Make all tables readonly, with the exception for replication (slave) threads and users with the SUPER privilege",
(gptr*) &opt_readonly,
(gptr*) &opt_readonly,
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},