1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spelling fixes

Browse Source
This commit is contained in:
klemens 2017-02-26 16:49:47 +01:00 committed by Sergey Vojtovich
parent e823023e4b
commit 7be541f281
52 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql_plugin.c
View File

@ -1002,7 +1002,7 @@ found:
static int find_plugin(char *tp_path)
{
/* Check for existance of plugin */
/* Check for existence of plugin */
fn_format(tp_path, plugin_data.so_name, opt_plugin_dir, "", MYF(0));
if (!file_exists(tp_path))
{

4
client/mysql_upgrade.c
View File

@ -545,7 +545,7 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res,
But mysql_upgrade is tightly bound to a specific server version
anyway - it was mysql_fix_privilege_tables_sql script embedded
into its binary - so even if it won't assume anything about server
wsrep-ness, it won't be any less server-dependend.
wsrep-ness, it won't be any less server-dependent.
*/
const uchar sql_log_bin[]= "SET SQL_LOG_BIN=0, WSREP_ON=OFF;";
#else
@ -758,7 +758,7 @@ static void print_conn_args(const char *tool_name)
/*
Check and upgrade(if neccessary) all tables
Check and upgrade(if necessary) all tables
in the server using "mysqlcheck --check-upgrade .."
*/

2
client/mysqlbinlog.cc
View File

@ -2542,7 +2542,7 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
/* read from stdin */
/*
Windows opens stdin in text mode by default. Certain characters
such as CTRL-Z are interpeted as events and the read() method
such as CTRL-Z are interpreted as events and the read() method
will stop. CTRL-Z is the EOF marker in Windows. to get past this
you have to open stdin in binary mode. Setmode() is used to set
stdin in binary mode. Errors on setting this mode result in

22
client/mysqltest.cc
View File

@ -2490,7 +2490,7 @@ VAR *var_obtain(const char *name, int len)
/*
- if variable starts with a $ it is regarded as a local test varable
- if variable starts with a $ it is regarded as a local test variable
- if not it is treated as a environment variable, and the corresponding
environment variable will be updated
*/
@ -3325,7 +3325,7 @@ static int replace(DYNAMIC_STRING *ds_str,
NOTE
Although mysqltest is executed from cygwin shell, the command will be
executed in "cmd.exe". Thus commands like "rm" etc can NOT be used, use
mysqltest commmand(s) like "remove_file" for that
mysqltest command(s) like "remove_file" for that
*/
void do_exec(struct st_command *command)
@ -6554,7 +6554,7 @@ int read_line(char *buf, int size)
start_lineno));
}
/* Skip all space at begining of line */
/* Skip all space at beginning of line */
skip_char= 1;
}
else if (end_of_query(c))
@ -6566,10 +6566,10 @@ int read_line(char *buf, int size)
}
else if (c == '}')
{
/* A "}" need to be by itself in the begining of a line to terminate */
/* A "}" need to be by itself in the beginning of a line to terminate */
*p++= c;
*p= 0;
DBUG_PRINT("exit", ("Found '}' in begining of a line at line: %d",
DBUG_PRINT("exit", ("Found '}' in beginning of a line at line: %d",
cur_file->lineno));
DBUG_RETURN(0);
}
@ -7931,7 +7931,7 @@ void handle_error(struct st_command *command,
{
/*
The query after a "--require" failed. This is fine as long the server
returned a valid reponse. Don't allow 2013 or 2006 to trigger an
returned a valid response. Don't allow 2013 or 2006 to trigger an
abort_not_supported_test
*/
if (err_errno == CR_SERVER_LOST ||
@ -9012,7 +9012,7 @@ int main(int argc, char **argv)
var_set_string("MYSQLTEST_FILE", cur_file->file_name);
init_re();
/* Cursor protcol implies ps protocol */
/* Cursor protocol implies ps protocol */
if (cursor_protocol)
ps_protocol= 1;
@ -9110,7 +9110,7 @@ int main(int argc, char **argv)
abort_on_error);
/*
some commmands need to be executed or at least parsed unconditionally,
some commands need to be executed or at least parsed unconditionally,
because they change the grammar.
*/
ok_to_do= cur_block->ok || command->type == Q_DELIMITER
@ -9542,7 +9542,7 @@ int main(int argc, char **argv)
die("Test ended with parsing disabled");
/*
The whole test has been executed _sucessfully_.
The whole test has been executed _successfully_.
Time to compare result or save it to record file.
The entire output from test is in the log file
*/
@ -9588,7 +9588,7 @@ int main(int argc, char **argv)
verbose_msg("Test has succeeded!");
timer_output();
/* Yes, if we got this far the test has suceeded! Sakila smiles */
/* Yes, if we got this far the test has succeeded! Sakila smiles */
cleanup_and_exit(0);
return 0; /* Keep compiler happy too */
}
@ -10083,7 +10083,7 @@ void free_replace_regex()
buf_len_p - result buffer length. Will change if the buffer is reallocated
pattern - regexp pattern to match
replace - replacement expression
string - the string to perform substituions in
string - the string to perform substitutions in
icase - flag, if set to 1 the match is case insensitive
*/
int reg_replace(char** buf_p, int* buf_len_p, char *pattern,

2
client/sql_string.cc.dontuse
View File

@ -267,7 +267,7 @@ bool String::set_or_copy_aligned(const char *str,uint32 arg_length,
return copy_aligned(str, arg_length, offset, cs);
}
/* Copy with charset convertion */
/* Copy with charset conversion */
bool String::copy(const char *str, uint32 arg_length,
CHARSET_INFO *from_cs, CHARSET_INFO *to_cs, uint *errors)

4
debian/additions/mysqlreport vendored
View File

@ -357,7 +357,7 @@ sub read_relative_infiles
select $tmpfile_fh[$i];
# Read infile again and copy each set of status values to seperate tmp files
# Read infile again and copy each set of status values to separate tmp files
open INFILE, "< $infile" or warn and next;
while(<INFILE>)
{
@ -365,7 +365,7 @@ sub read_relative_infiles
next if /^$/;
# The infile must begin with the system variable values.
# Therefore, the first occurance of Aborted_clients indicates the beginning
# Therefore, the first occurrence of Aborted_clients indicates the beginning
# of the first set of status values if no sets have occurred yet ($stat_n == 0).
# In this case, the following status values are printed to the current fh,
# along with the system variable values read thus far, until Aborted_clients

2
debian/mariadb-server-10.1.mysql.init vendored
View File

@ -25,7 +25,7 @@ SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
CONF=/etc/mysql/my.cnf
MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
# priority can be overriden and "-s" adds output to stderr
# priority can be overridden and "-s" adds output to stderr
ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i"
# Safeguard (relative paths, core dumps..)

2
debian/mariadb-server-10.1.postinst vendored
View File

@ -239,7 +239,7 @@ db_stop # in case invoke failes
# dh_systemd_start doesn't emit anything since we still ship /etc/init.d/mysql.
# Thus MariaDB server is started via init.d script, which in turn redirects to
# systemctl. If we upgrade from MySQL mysql.service may be masked, which also
# means init.d script is disabled. Unmask mysql service explicitely.
# means init.d script is disabled. Unmask mysql service explicitly.
# Check first that the command exists, to avoid emitting any warning messages.
if [ -x "$(command -v deb-systemd-helper)" ]; then
deb-systemd-helper unmask mysql.service > /dev/null

2
extra/charset2html.c
View File

@ -97,7 +97,7 @@ static void print_cs(CHARSET_INFO *cs)
{
/*
Control characters 0x0080..0x009F are dysplayed by some
browers as if they were letters. Don't print them to
browsers as if they were letters. Don't print them to
avoid confusion.
*/
printf("<TD>ctrl<TD>ctrl<TD>ctrl");

2
extra/replace.c
View File

@ -36,7 +36,7 @@
The programs make a DFA-state-machine of the strings and the speed isn't
dependent on the count of replace-strings (only of the number of replaces).
A line is assumed ending with \n or \0.
There are no limit exept memory on length of strings.
There are no limit except memory on length of strings.
Written by Monty.
fill_buffer_retaining() is taken from gnu-grep and modified.

2
libmysql/CMakeLists.txt
View File

@ -476,7 +476,7 @@ IF(NOT DISABLE_SHARED)
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
COMPONENT SharedLibraries)
IF(UNIX)
# libtool compatability
# libtool compatibility
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")

20
libmysql/libmysql.c
View File

@ -195,7 +195,7 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
the library.
To make things simpler when used with windows dll's (which calls this
function automaticly), it's safe to call this function multiple times.
function automatically), it's safe to call this function multiple times.
*/
@ -220,7 +220,7 @@ void STDCALL mysql_server_end()
}
#ifdef NOT_NEEDED
/*
The following is not needed as if the program explicitely called
The following is not needed as if the program explicitly called
my_init() then we can assume it will also call my_end().
The reason to not also do it here is in that case we can't get
statistics from my_end() to debug log.
@ -605,7 +605,7 @@ static int default_local_infile_init(void **ptr, const char *filename,
default_local_infile_read()
ptr Points to handle allocated by _init
buf Read data here
buf_len Ammount of data to read
buf_len Amount of data to read
RETURN
> 0 number of bytes read
@ -660,7 +660,7 @@ static void default_local_infile_end(void *ptr)
ptr Points to handle allocated by _init
May be NULL if _init failed!
error_msg Store error text here
error_msg_len Max lenght of error_msg
error_msg_len Max length of error_msg
RETURN
error message number
@ -1270,7 +1270,7 @@ static int stmt_read_row_no_result_set(MYSQL_STMT *stmt, unsigned char **row);
static void stmt_update_metadata(MYSQL_STMT *stmt, MYSQL_ROWS *data);
static my_bool setup_one_fetch_function(MYSQL_BIND *, MYSQL_FIELD *field);
/* Auxilary function used to reset statement handle. */
/* Auxiliary function used to reset statement handle. */
#define RESET_SERVER_SIDE 1
#define RESET_LONG_DATA 2
@ -1814,7 +1814,7 @@ static void update_stmt_fields(MYSQL_STMT *stmt)
RETURN
NULL statement contains no result set or out of memory.
In the latter case you can retreive error message
In the latter case you can retrieve error message
with mysql_stmt_error.
MYSQL_RES a result set with no rows
*/
@ -1852,7 +1852,7 @@ mysql_stmt_result_metadata(MYSQL_STMT *stmt)
Returns parameter columns meta information in the form of
result set.
SYNOPSYS
SYNOPSIS
mysql_stmt_param_metadata()
stmt statement handle
@ -1901,7 +1901,7 @@ static void store_param_type(unsigned char **pos, MYSQL_BIND *param)
param MySQL bind param
DESCRIPTION
These funtions are invoked from mysql_stmt_execute() by
These functions are invoked from mysql_stmt_execute() by
MYSQL_BIND::store_param_func pointer. This pointer is set once per
many executions in mysql_stmt_bind_param(). The caller must ensure
that network buffer have enough capacity to store parameter
@ -2078,7 +2078,7 @@ static my_bool store_param(MYSQL_STMT *stmt, MYSQL_BIND *param)
/*
Auxilary function to send COM_STMT_EXECUTE packet to server and read reply.
Auxiliary function to send COM_STMT_EXECUTE packet to server and read reply.
Used from cli_stmt_execute, which is in turn used by mysql_stmt_execute.
*/
@ -4466,7 +4466,7 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt)
if (stmt->update_max_length && !stmt->bind_result_done)
{
/*
We must initalize the bind structure to be able to calculate
We must initialize the bind structure to be able to calculate
max_length
*/
MYSQL_BIND *my_bind, *end;

2
mysys/array.c
View File

@ -90,7 +90,7 @@ my_bool insert_dynamic(DYNAMIC_ARRAY *array, const void * element)
{
void *buffer;
if (array->elements == array->max_element)
{ /* Call only when nessesary */
{ /* Call only when necessary */
if (!(buffer=alloc_dynamic(array)))
return TRUE;
}

4
mysys/hash.c
View File

@ -61,7 +61,7 @@ my_hash_value_type my_hash_sort(CHARSET_INFO *cs, const uchar *key,
@param[in,out] hash The hash that is initialized
@param[in[ growth_size size incrememnt for the underlying dynarray
@param[in] charset The charater set information
@param[in] charset The character set information
@param[in] size The hash size
@param[in] key_offest The key offset for the hash
@param[in] key_length The length of the key used in
@ -618,7 +618,7 @@ exit:
/**
Update keys when record has changed.
This is much more efficent than using a delete & insert.
This is much more efficient than using a delete & insert.
*/
my_bool my_hash_update(HASH *hash, uchar *record, uchar *old_key,

4
mysys/lf_alloc-pin.c
View File

@ -139,7 +139,7 @@ void lf_pinbox_destroy(LF_PINBOX *pinbox)
Get pins from a pinbox. Usually called via lf_alloc_get_pins() or
lf_hash_get_pins().
SYNOPSYS
SYNOPSIS
pinbox -
DESCRIPTION
@ -443,7 +443,7 @@ static void alloc_free(uchar *first,
/*
initialize lock-free allocator
SYNOPSYS
SYNOPSIS
allocator -
size a size of an object to allocate
free_ptr_offset an offset inside the object to a sizeof(void *)

8
mysys/lf_hash.c
View File

@ -201,7 +201,7 @@ static LF_SLIST *l_insert(LF_SLIST * volatile *head, CHARSET_INFO *cs,
lf_unpin(pins, 2);
/*
Note that cursor.curr is not pinned here and the pointer is unreliable,
the object may dissapear anytime. But if it points to a dummy node, the
the object may disappear anytime. But if it points to a dummy node, the
pointer is safe, because dummy nodes are never freed - initialize_bucket()
uses this fact.
*/
@ -333,7 +333,7 @@ static void default_initializer(LF_HASH *hash, void *dst, const void *src)
lf_alloc and a size of memcpy'ed block size in lf_hash_insert. Typically
they are the same, indeed. But LF_HASH::element_size can be decreased
after lf_hash_init, and then lf_alloc will allocate larger block that
lf_hash_insert will copy over. It is desireable if part of the element
lf_hash_insert will copy over. It is desirable if part of the element
is expensive to initialize - for example if there is a mutex or
DYNAMIC_ARRAY. In this case they should be initialize in the
LF_ALLOCATOR::constructor, and lf_hash_insert should not overwrite them.
@ -442,7 +442,7 @@ int lf_hash_delete(LF_HASH *hash, LF_PINS *pins, const void *key, uint keylen)
hashnr= hash->hash_function(hash->charset, (uchar *)key, keylen) & INT_MAX32;
/* hide OOM errors - if we cannot initalize a bucket, try the previous one */
/* hide OOM errors - if we cannot initialize a bucket, try the previous one */
for (bucket= hashnr % hash->size; ;bucket= my_clear_highest_bit(bucket))
{
el= lf_dynarray_lvalue(&hash->array, bucket);
@ -476,7 +476,7 @@ void *lf_hash_search_using_hash_value(LF_HASH *hash, LF_PINS *pins,
LF_SLIST * volatile *el, *found;
uint bucket;
/* hide OOM errors - if we cannot initalize a bucket, try the previous one */
/* hide OOM errors - if we cannot initialize a bucket, try the previous one */
for (bucket= hashnr % hash->size; ;bucket= my_clear_highest_bit(bucket))
{
el= lf_dynarray_lvalue(&hash->array, bucket);

10
mysys/ma_dyncol.c
View File

@ -2066,7 +2066,7 @@ static uchar *find_entry_named(DYN_HEADER *hdr, LEX_STRING *key)
/**
Write number in the buffer (backward direction - starts from the buffer end)
@return pointer on the number begining
@return pointer on the number beginning
*/
static char *backwritenum(char *chr, uint numkey)
@ -2136,7 +2136,7 @@ find_column(DYN_HEADER *hdr, uint numkey, LEX_STRING *strkey)
hdr->length= hdr_interval_length(hdr, hdr->entry + hdr->entry_size);
hdr->data= hdr->dtpool + hdr->offset;
/*
Check that the found data is withing the ranges. This can happen if
Check that the found data is within the ranges. This can happen if
we get data with wrong offsets.
*/
if (hdr->length == DYNCOL_OFFSET_ERROR ||
@ -3480,7 +3480,7 @@ dynamic_column_update_many_fmt(DYNAMIC_COLUMN *str,
if (plan[i].val->type == DYN_COL_NULL)
{
plan[i].act= PLAN_NOP; /* Mark entry to be skiped */
plan[i].act= PLAN_NOP; /* Mark entry to be skipped */
}
else
{
@ -4129,7 +4129,7 @@ mariadb_dyncol_json_internal(DYNAMIC_COLUMN *str, DYNAMIC_STRING *json,
hdr_interval_length(&header, header.entry + header.entry_size);
header.data= header.dtpool + header.offset;
/*
Check that the found data is withing the ranges. This can happen if
Check that the found data is within the ranges. This can happen if
we get data with wrong offsets.
*/
if (header.length == DYNCOL_OFFSET_ERROR ||
@ -4269,7 +4269,7 @@ mariadb_dyncol_unpack(DYNAMIC_COLUMN *str,
hdr_interval_length(&header, header.entry + header.entry_size);
header.data= header.dtpool + header.offset;
/*
Check that the found data is withing the ranges. This can happen if
Check that the found data is within the ranges. This can happen if
we get data with wrong offsets.
*/
if (header.length == DYNCOL_OFFSET_ERROR ||

2
mysys/mf_fn_ext.c
View File

@ -86,7 +86,7 @@ char *fn_ext2(const char *name)
if (!(gpos= strrchr(name, FN_LIBCHAR)))
gpos= name;
#endif
// locate the last occurence of FN_EXTCHAR
// locate the last occurrence of FN_EXTCHAR
pos= strrchr(gpos, FN_EXTCHAR);
DBUG_RETURN((char*) (pos ? pos : strend(gpos)));
} /* fn_ext2 */

8
mysys/mf_iocache.c
View File

@ -82,7 +82,7 @@ int (*_my_b_encr_write)(IO_CACHE *info,const uchar *Buffer,size_t Count)= 0;
info IO_CACHE handler
NOTES
This is called on automaticly on init or reinit of IO_CACHE
This is called on automatically on init or reinit of IO_CACHE
It must be called externally if one moves or copies an IO_CACHE
object.
*/
@ -166,7 +166,7 @@ init_functions(IO_CACHE* info)
If == 0 then use my_default_record_cache_size
type Type of cache
seek_offset Where cache should start reading/writing
use_async_io Set to 1 of we should use async_io (if avaiable)
use_async_io Set to 1 of we should use async_io (if available)
cache_myflags Bitmap of different flags
MY_WME | MY_FAE | MY_NABP | MY_FNABP |
MY_DONT_CHECK_FILESIZE
@ -343,7 +343,7 @@ static void my_aiowait(my_aio_result *result)
if (errno == EINTR)
continue;
DBUG_PRINT("error",("No aio request, error: %d",errno));
result->pending=0; /* Assume everythings is ok */
result->pending=0; /* Assume everything is ok */
break;
}
((my_aio_result*) tmp)->pending=0;
@ -1999,7 +1999,7 @@ int main(int argc, char** argv)
/* check correctness of tests */
if (total_bytes != status.st_size)
{
fprintf(stderr,"Not the same number of bytes acutally in file as bytes \
fprintf(stderr,"Not the same number of bytes actually in file as bytes \
supposedly written\n");
error=1;
}

6
mysys/mf_keycache.c
View File

@ -58,11 +58,11 @@
When a new block is required it is first tried to pop one from the stack.
If the stack is empty, it is tried to get a never-used block from the pool.
If this is empty too, then a block is taken from the LRU ring, flushing it
to disk, if neccessary. This is handled in find_key_block().
to disk, if necessary. This is handled in find_key_block().
With the new free list, the blocks can have three temperatures:
hot, warm and cold (which is free). This is remembered in the block header
by the enum BLOCK_TEMPERATURE temperature variable. Remembering the
temperature is neccessary to correctly count the number of warm blocks,
temperature is necessary to correctly count the number of warm blocks,
which is required to decide when blocks are allowed to become hot. Whenever
a block is inserted to another (sub-)chain, we take the old and new
temperature into account to decide if we got one more or less warm block.
@ -450,7 +450,7 @@ static inline uint next_power(uint value)
structure of the type SIMPLE_KEY_CACHE_CB that is used for this key cache.
The parameter keycache is supposed to point to this structure.
The parameter key_cache_block_size specifies the size of the blocks in
the key cache to be built. The parameters division_limit and age_threshhold
the key cache to be built. The parameters division_limit and age_threshold
determine the initial values of those characteristics of the key cache
that are used for midpoint insertion strategy. The parameter use_mem
specifies the total amount of memory to be allocated for key cache blocks

2
mysys/my_access.c
View File

@ -223,7 +223,7 @@ my_bool is_filename_allowed(const char *name __attribute__((unused)),
/*
Check if a path will access a reserverd file name that may cause problems
Check if a path will access a reserved file name that may cause problems
SYNOPSIS
check_if_legal_filename

2
mysys/my_alloc.c
View File

@ -43,7 +43,7 @@
DESCRIPTION
This function prepares memory root for further use, sets initial size of
chunk for memory allocation and pre-allocates first block if specified.
Altough error can happen during execution of this function if
Although error can happen during execution of this function if
pre_alloc_size is non-0 it won't be reported. Instead it will be
reported as error in first alloc_root() on this memory root.

4
mysys/my_compare.c
View File

@ -99,12 +99,12 @@ static int compare_bin(const uchar *a, uint a_length,
Example1: if the function is called for tuples
('aaa','bbb') and ('eee','fff'), then
diff_pos[0] = 1 (as 'aaa' != 'eee')
diff_pos[1] = 0 (offset from beggining of tuple b to 'eee' keypart).
diff_pos[1] = 0 (offset from beginning of tuple b to 'eee' keypart).
Example2: if the index function is called for tuples
('aaa','bbb') and ('aaa','fff'),
diff_pos[0] = 2 (as 'aaa' != 'eee')
diff_pos[1] = 3 (offset from beggining of tuple b to 'fff' keypart,
diff_pos[1] = 3 (offset from beginning of tuple b to 'fff' keypart,
here we assume that first key part is CHAR(3) NOT NULL)
NOTES

2
mysys/my_compress.c
View File

@ -162,7 +162,7 @@ uchar *my_compress_alloc(const uchar *packet, size_t *len, size_t *complen)
SYNOPSIS
my_uncompress()
packet Compressed data. This is is replaced with the orignal data.
packet Compressed data. This is is replaced with the original data.
len Length of compressed data
complen Length of the packet buffer (must be enough for the original
data)

6
mysys/my_default.c
View File

@ -24,7 +24,7 @@
pre- and end 'blank space' are removed from options and values. The
following escape sequences are recognized in values: \b \t \n \r \\
The following arguments are handled automaticly; If used, they must be
The following arguments are handled automatically; If used, they must be
first argument on the command line!
--no-defaults ; no options are read.
--defaults-file=full-path-to-default-file ; Only this file will be read.
@ -62,7 +62,7 @@
check the pointer, use "----args-separator----" here to ease debug
if someone misused it.
The args seprator will only be added when
The args separator will only be added when
my_getopt_use_args_seprator is set to TRUE before calling
load_defaults();
@ -597,7 +597,7 @@ int my_load_defaults(const char *conf_file, const char **groups,
(*argv)+= args_used;
/*
Check if we wan't to see the new argument list
Check if we want to see the new argument list
This options must always be the last of the default options
*/
if (*argc >= 2 && !strcmp(argv[0][1],"--print-defaults"))

2
mysys/my_getwd.c
View File

@ -37,7 +37,7 @@
MyFlags Flags
NOTES
Directory is allways ended with FN_LIBCHAR
Directory is always ended with FN_LIBCHAR
RESULT
0 ok

4
mysys/my_init.c
View File

@ -99,7 +99,7 @@ my_bool my_init(void)
if (my_progname)
my_progname_short= my_progname + dirname_length(my_progname);
/* Initalize our mutex handling */
/* Initialize our mutex handling */
my_mutex_init();
if (my_thread_global_init())
@ -415,7 +415,7 @@ static my_bool win32_init_tcp_ip()
WORD wVersionRequested = MAKEWORD( 2, 2 );
WSADATA wsaData;
/* Be a good citizen: maybe another lib has already initialised
sockets, so dont clobber them unless necessary */
sockets, so don't clobber them unless necessary */
if (WSAStartup( wVersionRequested, &wsaData ))
{
/* Load failed, maybe because of previously loaded

2
mysys/my_lib.c
View File

@ -14,7 +14,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/* TODO: check for overun of memory for names. */
/* TODO: check for overrun of memory for names. */
#include "mysys_priv.h"
#include <m_string.h>

4
mysys/my_pread.c
View File

@ -28,7 +28,7 @@
SYNOPSIOS
my_pread()
Filedes File decsriptor
Filedes File descriptor
Buffer Buffer to read data into
Count Number of bytes to read
offset Position to read from
@ -108,7 +108,7 @@ size_t my_pread(File Filedes, uchar *Buffer, size_t Count, my_off_t offset,
SYNOPSIOS
my_pwrite()
Filedes File decsriptor
Filedes File descriptor
Buffer Buffer to write data from
Count Number of bytes to write
offset Position to write to

4
mysys/my_redel.c
View File

@ -32,10 +32,10 @@ struct utimbuf {
/*
Rename with copy stat form old file
Copy stats from old file to new file, deletes orginal and
Copy stats from old file to new file, deletes original and
changes new file name to old file name
if MY_REDEL_MAKE_COPY is given, then the orginal file
if MY_REDEL_MAKE_COPY is given, then the original file
is renamed to org_name-'current_time'.BAK
*/

2
mysys/my_symlink2.c
View File

@ -17,7 +17,7 @@
/*
Advanced symlink handling.
This is used in MyISAM to let users symlinks tables to different disk.
The main idea with these functions is to automaticly create, delete and
The main idea with these functions is to automatically create, delete and
rename files and symlinks like they would be one unit.
*/

2
mysys/my_thr_init.c
View File

@ -262,7 +262,7 @@ my_bool my_thread_init(void)
my_bool error=0;
if (!my_thread_global_init_done)
return 1; /* cannot proceed with unintialized library */
return 1; /* cannot proceed with uninitialized library */
#ifdef EXTRA_DEBUG_THREADS
fprintf(stderr,"my_thread_init(): pthread_self: %p\n", pthread_self());

2
mysys/my_windac.c
View File

@ -33,7 +33,7 @@ static my_bool is_nt()
}
/*
Auxilary structure to store pointers to the data which we need to keep
Auxiliary structure to store pointers to the data which we need to keep
around while SECURITY_ATTRIBUTES is in use.
*/

2
mysys/my_winerr.c
View File

@ -117,7 +117,7 @@ static int get_errno_from_oserr(unsigned long oserrno)
return EINVAL;
}
/* Set errno corresponsing to GetLastError() value */
/* Set errno corresponding to GetLastError() value */
void my_osmaperr ( unsigned long oserrno)
{
errno= get_errno_from_oserr(oserrno);

2
mysys/queues.c
View File

@ -27,7 +27,7 @@
This code originates from the Unireg project.
Code for generell handling of priority Queues.
Implemention of queues from "Algoritms in C" by Robert Sedgewick.
Implementation of queues from "Algorithms in C" by Robert Sedgewick.
The queue can optionally store the position in queue in the element
that is in the queue. This allows one to remove any element from the queue

10
mysys/thr_lock.c
View File

@ -528,8 +528,8 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data,
One can use this to signal when a thread is going to wait for a lock.
See debug_sync.cc.
Beware of waiting for a signal here. The lock has aquired its mutex.
While waiting on a signal here, the locking thread could not aquire
Beware of waiting for a signal here. The lock has acquired its mutex.
While waiting on a signal here, the locking thread could not acquire
the mutex to release the lock. One could lock up the table
completely.
@ -799,8 +799,8 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout)
\ = READ
+ = Request can be satisified.
- = Request cannot be satisified.
+ = Request can be satisfied.
- = Request cannot be satisfied.
READ_NO_INSERT and WRITE_ALLOW_WRITE should in principle
be incompatible. However this will cause starvation of
@ -1257,7 +1257,7 @@ end:
/*
Get all locks in a specific order to avoid dead-locks
Sort acording to lock position and put write_locks before read_locks if
Sort according to lock position and put write_locks before read_locks if
lock on same lock. Locks on MERGE tables has lower priority than other
locks of the same type. See comment for lock_priority.
*/

4
mysys/tree.c
View File

@ -30,8 +30,8 @@
3) if key_size is given to init_tree then each node will continue the
key and calls to insert_key may increase length of key.
if key_size > sizeof(pointer) and key_size is a multiple of 8 (double
allign) then key will be put on a 8 alligned adress. Else
the key will be on adress (element+1). This is transparent for user
align) then key will be put on a 8 aligned address. Else
the key will be on address (element+1). This is transparent for user
compare and search functions uses a pointer to given key-argument.
- If you use a free function for tree-elements and you are freeing

2
mysys/typelib.c
View File

@ -182,7 +182,7 @@ const char *get_type(TYPELIB *typelib, uint nr)
/**
Create an integer value to represent the supplied comma-seperated
Create an integer value to represent the supplied comma-separated
string where each string in the TYPELIB denotes a bit position.
@param x string to decompose

2
mysys/waiting_threads.c
View File

@ -136,7 +136,7 @@
Status
^^^^^^
We calculate the number of successfull waits (WT_OK returned from
We calculate the number of successful waits (WT_OK returned from
wt_thd_cond_timedwait()), a number of timeouts, a deadlock cycle
length distribution - number of deadlocks with every length from
1 to WT_CYCLE_STATS, and a wait time distribution - number

2
mysys/wqueue.c
View File

@ -211,7 +211,7 @@ void wqueue_release_one_locktype_from_queue(WQUEUE *wqueue)
/*
Add thread and wait
SYNOPSYS
SYNOPSIS
wqueue_add_and_wait()
wqueue queue to add to
thread thread which is waiting

4
plugin/auth_gssapi/README.md
View File

@ -108,7 +108,7 @@ mysql --plugin-dir=/path/to/plugin-dir -u usr1
- **gssapi-mech-name** (Windows only) - Name of the SSPI package used by server. Can be either 'Kerberos' or 'Negotiate'.
Defaults to 'Negotiate' (both Kerberos and NTLM users can connect)
Set it to 'Kerberos', to prevent less secure NTLM in domain environments, but leave it as default(Negotiate)
to allow non-domain environment (e.g if server does not run in domain enviroment).
to allow non-domain environment (e.g if server does not run in domain environment).
#Implementation
@ -124,6 +124,6 @@ Send resulting GSSAPI blob to server.
3. Server : receive blob from client, execute ```gss_accept_sec_context()/ AcceptSecurityContext()```, send resulting blob back to client
4. Perform 2. and 3. can until both client and server decide that authentication is done, or until some error occured. If authentication was successful, GSSAPI context (an opaque structure) is generated on both client and server sides.
4. Perform 2. and 3. can until both client and server decide that authentication is done, or until some error occurred. If authentication was successful, GSSAPI context (an opaque structure) is generated on both client and server sides.
5. Server : Client name is extracted from the context, and compared to the name provided by client(with or without realm). If name matches, plugin returns success.

4
plugin/auth_pam/mapper/pam_user_map.c
View File

@ -6,7 +6,7 @@
gcc pam_user_map.c -shared -lpam -fPIC -o pam_user_map.so
Install as appropriate (for example, in /lib/security/).
Add to your /etc/pam.d/mysql (preferrably, at the end) this line:
Add to your /etc/pam.d/mysql (preferably, at the end) this line:
=========================================================
auth required pam_user_map.so
=========================================================
@ -15,7 +15,7 @@ auth required pam_user_map.so
in the format: orig_user_name: mapped_user_name
@user's_group_name: mapped_user_name
=========================================================
#comments and emtpy lines are ignored
#comments and empty lines are ignored
john: jack
bob: admin
top: accounting

2
plugin/aws_key_management/CMakeLists.txt
View File

@ -10,7 +10,7 @@
# Give message why the building this plugin is skipped (only if -DVERBOSE is defined)
# or if plugin is explicitely requested to build. Then bail out.
# or if plugin is explicitly requested to build. Then bail out.
MACRO(SKIP_AWS_PLUGIN msg)
IF(VERBOSE OR "${PLUGIN_AWS_KEY_MANAGEMENT}" MATCHES "^(STATIC|DYNAMIC)$")
MESSAGE(STATUS "Can't build aws_key_management - ${msg}")

2
plugin/server_audit/plugin_audit_v4.h
View File

@ -232,7 +232,7 @@ struct mysql_event_parse
/** input: the original query text */
MYSQL_LEX_CSTRING query;
/** output: returns the null-terminated rewriten query allocated by my_malloc() */
/** output: returns the null-terminated rewritten query allocated by my_malloc() */
MYSQL_LEX_CSTRING *rewritten_query;
};

2
plugin/win_auth_client/handshake_client.cc
View File

@ -216,7 +216,7 @@ int Handshake_client::write_packet(Blob &data)
an empty blob is returned and @c error() gives non-zero error code.
When invoked for the first time (in the first round of the handshake)
there is no data from the server (data blob is null) and the intial
there is no data from the server (data blob is null) and the initial
packet is generated without an input.
@return Data to be sent to the server next or null blob if no more data

4
support-files/MacOSX/ReadMe.txt
View File

@ -110,7 +110,7 @@ Note
Continue .
5. If you have downloaded the community version of MySQL, you
will be shown a copy of the relevent GNU General Public
will be shown a copy of the relevant GNU General Public
License. Click Continue .
6. Select the drive you want to use to install the MySQL Startup
@ -128,7 +128,7 @@ Note
will be given an Install Succeeded message.
Once you have completed the basic installation, you must complete
the post-installation steps as specifed in Section 2.13,
the post-installation steps as specified in Section 2.13,
"Post-Installation Setup and Testing."
For convenience, you may also want to install the Section 2.7.2,

2
support-files/compiler_warnings.supp
View File

@ -153,7 +153,7 @@ include/pwdbased\.hpp: comparison of unsigned expression
# OpenSSL
#
# The following comes because of different prototype between yassl and openssl.
# Save as the argument is a function withing the library.
# Save as the argument is a function within the library.
vio/viosslfactories\.c: discards ~const~ qualifier from pointer target type
#

2
support-files/mariadb.service.in
View File

@ -136,7 +136,7 @@ LimitNOFILE=16364
# Timezone. previously [mysqld_safe] timezone
# Environment="TZ=UTC"
# Library substitutions. previously [mysqld_safe] malloc-lib with explict paths
# Library substitutions. previously [mysqld_safe] malloc-lib with explicit paths
# (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD).
# Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD=

4
support-files/mariadb@.service.in
View File

@ -1,4 +1,4 @@
# Multi instance version of mariadb. For if you run mutiple verions at once.
# Multi instance version of mariadb. For if you run multiple versions at once.
# Also used for mariadb@bootstrap to bootstrap Galera.
#
# create config file @INSTALL_SYSCONF2DIR@/my{instancename}.cnf
@ -157,7 +157,7 @@ LimitNOFILE=16364
# Timezone. previously [mysqld_safe] timezone
# Environment="TZ=UTC"
# Library substitutions. previously [mysqld_safe] malloc-lib with explict paths
# Library substitutions. previously [mysqld_safe] malloc-lib with explicit paths
# (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD).
# Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD=

4
support-files/my-innodb-heavy-4G.cnf.sh
View File

@ -306,7 +306,7 @@ server-id = 1
# Make the slave read-only. Only users with the SUPER privilege and the
# replication slave thread will be able to modify data on it. You can
# use this to ensure that no applications will accidently modify data on
# use this to ensure that no applications will accidentally modify data on
# the slave instead of the master
#read_only
@ -439,7 +439,7 @@ innodb_log_files_in_group = 3
#innodb_log_group_home_dir
# Maximum allowed percentage of dirty pages in the InnoDB buffer pool.
# If it is reached, InnoDB will start flushing them out agressively to
# If it is reached, InnoDB will start flushing them out aggressively to
# not run out of clean pages at all. This is a soft limit, not
# guaranteed to be held.
innodb_max_dirty_pages_pct = 90

2
support-files/mysql-multi.server.sh
View File

@ -12,7 +12,7 @@
# started and shut down when the systems goes down. The '.svr1' suffix can
# be used to identify one of a number of servers. Multiple symlinks can be
# created, one per instance. The 'svrN' suffix can then be used to
# prefix configuration variables in a seperate section of /etc/my.cnf.
# prefix configuration variables in a separate section of /etc/my.cnf.
# See example below.
#
# A typical multi-instance /etc/my.cnf file would look like:

2
support-files/mysql.server.sh
View File

@ -48,7 +48,7 @@ datadir=
# Default value, in seconds, afterwhich the script should timeout waiting
# for server start.
# Value here is overriden by value in my.cnf.
# Value here is overridden by value in my.cnf.
# 0 means don't wait at all
# Negative numbers mean to wait indefinitely
service_startup_timeout=900