diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | Docs/manual.texi | 2 | ||||
| -rw-r--r-- | dbug/monty.doc | 8 | ||||
| -rw-r--r-- | isam/isamchk.c | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 2 | ||||
| -rwxr-xr-x | sql-bench/server-cfg.sh | 2 | ||||
| -rw-r--r-- | sql/sql_base.cc | 2 | ||||
| -rw-r--r-- | sql/sql_test.cc | 2 |
8 files changed, 11 insertions, 10 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 2f0845b6997..0f852e34a0a 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,2 +1,3 @@ monty@donna.mysql.com sasha@mysql.sashanet.com +jcole@jcole.burghcom.com diff --git a/Docs/manual.texi b/Docs/manual.texi index f16f39a83c8..a6be06ad7b5 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -8962,7 +8962,7 @@ and @file{.frm} files to which the table corresponds. In SQL statements, you can access tables from different databases with the @code{db_name.tbl_name} syntax. Some SQL servers provide the same functionality but call this @code{User space}. -@strong{MySQL} dosen't support tablespaces like in: +@strong{MySQL} doesn't support tablespaces like in: @code{create table ralph.my_table...IN my_tablespace}. @item diff --git a/dbug/monty.doc b/dbug/monty.doc index c96f0742b26..f6d8bdff9cd 100644 --- a/dbug/monty.doc +++ b/dbug/monty.doc @@ -1,11 +1,11 @@ Some extra options to DBUG_PUSH: -O,logfile - As "o,logfile", but do a close and reopen each time anything - is written to the logfile. This is neaded when one expects - the program to crash anywhere, in which case one dosen't +O,logfile - As in "o,logfile", but do a close and reopen each time anything + is written to the logfile. This is needed when one expects + the program to crash anywhere, in which case one doesn't (at least in MSDOS) get a full log-file. -If one wants a logfile with a ': in the filename, one can get it by +If one wants a logfile with a ':' in the filename, one can get it by giving a double ':'. (As in "O,c::\tmp\log") DBUG_DUMP("keyword",memory-position,length) writes a hexdump of the diff --git a/isam/isamchk.c b/isam/isamchk.c index 97d190b7115..2f2471c4376 100644 --- a/isam/isamchk.c +++ b/isam/isamchk.c @@ -1401,7 +1401,7 @@ int extend; } else if (record_checksum != intern_record_checksum && info->s->state.keys) { - print_error("Keypointers and records dosen't match"); + print_error("Keypointers and records don't match"); error=1; } if (used+empty+del_length != info->s->state.data_file_length) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 2b9cd7d2461..b81af161671 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1983,7 +1983,7 @@ mysql_data_seek(MYSQL_RES *result, my_ulonglong row) /************************************************************************* ** put the row or field cursor one a position one got from mysql_row_tell() -** This dosen't restore any data. The next mysql_fetch_row or +** This doesn't restore any data. The next mysql_fetch_row or ** mysql_fetch_field will return the next row or field after the last used *************************************************************************/ diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh index a074efda4d9..2ecd5104adb 100755 --- a/sql-bench/server-cfg.sh +++ b/sql-bench/server-cfg.sh @@ -421,7 +421,7 @@ sub create $field =~ s/tinyint|smallint|mediumint|integer/int/i; # mSQL can't handle different visual lengths $field =~ s/int\(\d*\)/int/i; - # mSQL dosen't have float, change it to real + # mSQL doesn't have float, change it to real $field =~ s/float(\(\d*,\d*\)){0,1}/real/i; $field =~ s/double(\(\d*,\d*\)){0,1}/real/i; # mSQL doesn't have blob, it has text instead diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 4b245b29e83..983ffef0ace 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -171,7 +171,7 @@ static void check_unused(void) } if (count != 0) { - DBUG_PRINT("error",("Unused_links dosen't match open_cache: diff: %d", /* purecov: inspected */ + DBUG_PRINT("error",("Unused_links doesn't match open_cache: diff: %d", /* purecov: inspected */ count)); /* purecov: inspected */ } } diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 411a85a5c55..cab4e6e72be 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -86,7 +86,7 @@ void print_cached_tables(void) } } if (count != unused) - printf("Unused_links (%d) dosen't match open_cache: %d\n", count,unused); + printf("Unused_links (%d) doesn't match open_cache: %d\n", count,unused); printf("\nCurrent refresh version: %ld\n",refresh_version); if (hash_check(&open_cache)) printf("Error: File hash table is corrupted\n"); |