summaryrefslogtreecommitdiff
path: root/merge
diff options
context:
space:
mode:
authorpaul@kite-hub.kitebird.com <>2004-06-03 11:52:54 -0500
committerpaul@kite-hub.kitebird.com <>2004-06-03 11:52:54 -0500
commit2f0ca1ce424a26f71d4b6ec85d890060ecb73c68 (patch)
treeb6459e6d651d238a8d518e834adcb05db8ffcf04 /merge
parentdeaa73fe42ba8c430c52c7e31c65af05cb19da0e (diff)
downloadmariadb-git-2f0ca1ce424a26f71d4b6ec85d890060ecb73c68.tar.gz
Fix skipp -> skip once and for all.
(Note: This affects only comments, not variable names.)
Diffstat (limited to 'merge')
-rw-r--r--merge/mrg_open.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge/mrg_open.c b/merge/mrg_open.c
index 83b776ea201..6bf75392131 100644
--- a/merge/mrg_open.c
+++ b/merge/mrg_open.c
@@ -62,7 +62,7 @@ int handle_locking)
{
if ((end=buff+length)[-1] == '\n')
end[-1]='\0';
- if (buff[0] && buff[0] != '#') /* Skipp empty lines and comments */
+ if (buff[0] && buff[0] != '#') /* Skip empty lines and comments */
{
last_isam=isam;
if (!test_if_hard_path(buff))