mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
Fix typos in the codebase.
This commit is contained in:
fluesvamp
Vicențiu Ciorbaru
parent
195833f1b6
commit
f2830af16c
22 changed files with 49 additions and 48 deletions
|
|
@ -121,7 +121,7 @@ get_make_parallel_flag
|
|||
|
||||
# SSL library to use.--with-ssl will select our bundled yaSSL
|
||||
# implementation of SSL. --with-ssl=yes will first try system library
|
||||
# then the boundled one --with-ssl=system will use the system library.
|
||||
# then the bundled one --with-ssl=system will use the system library.
|
||||
# We use bundled by default as this is guaranteed to work with Galera
|
||||
SSL_LIBRARY=--with-ssl
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ path=`dirname $0`
|
|||
. "$path/autorun.sh"
|
||||
|
||||
# C options:
|
||||
# -apo - auto-parallize for multiprocessors (implies -mp)
|
||||
# -apo - auto-parallelize for multiprocessors (implies -mp)
|
||||
# -mp - generate multiprocessor code
|
||||
# These two common optimization options apparently use 'sproc' model of
|
||||
# threading, which is not compatible with PTHREADS: don't add them unless you
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
/*
|
||||
echo is a replacement for the "echo" command builtin to cmd.exe
|
||||
on Windows, to get a Unix eqvivalent behaviour when running commands
|
||||
on Windows, to get a Unix equivalent behaviour when running commands
|
||||
like:
|
||||
$> echo "hello" | mysql
|
||||
|
||||
|
|
|
|||
|
|
@ -2334,7 +2334,7 @@ static bool add_line(String &buffer, char *line, size_t line_length,
|
|||
!(*in_string &&
|
||||
(mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)))
|
||||
{
|
||||
// Found possbile one character command like \c
|
||||
// Found possible one character command like \c
|
||||
|
||||
/*
|
||||
The null-terminating character (ASCII '\0') marks the end of user
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@ static char *convert_path(const char *argument)
|
|||
|
||||
@param[in] path The Windows path to examine.
|
||||
|
||||
@returns string containing excaped quotes if spaces found in path
|
||||
@returns string containing escaped quotes if spaces found in path
|
||||
*/
|
||||
static char *add_quotes(const char *path)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -701,7 +701,7 @@ static char upgrade_info_file[FN_REFLEN]= {0};
|
|||
Open or create mysql_upgrade_info file in servers data dir.
|
||||
|
||||
Take a lock to ensure there cannot be any other mysql_upgrades
|
||||
runninc concurrently
|
||||
running concurrently
|
||||
*/
|
||||
|
||||
const char *create_error_message=
|
||||
|
|
@ -762,7 +762,7 @@ static void open_mysql_upgrade_file()
|
|||
/**
|
||||
Place holder for versions that require a major upgrade
|
||||
|
||||
@return 0 upgrade has alredy been run on this version
|
||||
@return 0 upgrade has already been run on this version
|
||||
@return 1 upgrade has to be run
|
||||
|
||||
*/
|
||||
|
|
@ -786,7 +786,7 @@ static int faulty_server_versions(const char *version)
|
|||
file it's always better to report that the upgrade hasn't
|
||||
been performed.
|
||||
|
||||
@return 0 Upgrade has alredy been run on this version
|
||||
@return 0 Upgrade has already been run on this version
|
||||
@return > 0 Upgrade has to be run
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
|
||||
|
||||
/* maintaince of mysql databases */
|
||||
/* maintenance of mysql databases */
|
||||
|
||||
#include "client_priv.h"
|
||||
#include <signal.h>
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ enum Exit_status {
|
|||
|
||||
/**
|
||||
Pointer to the last read Annotate_rows_log_event. Having read an
|
||||
Annotate_rows event, we should not print it immediatedly because all
|
||||
Annotate_rows event, we should not print it immediately because all
|
||||
subsequent rbr events can be filtered away, and have to keep it for a while.
|
||||
Also because of that when reading a remote Annotate event we have to keep
|
||||
its binary log representation in a separately allocated buffer.
|
||||
|
|
|
|||
|
|
@ -919,7 +919,7 @@ static int handle_request_for_tables(char *tables, size_t length,
|
|||
case DO_ANALYZE:
|
||||
if (view)
|
||||
{
|
||||
printf("%-50s %s\n", tables, "Can't run anaylyze on a view");
|
||||
printf("%-50s %s\n", tables, "Can't run analyze on a view");
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
DBUG_ASSERT(!view);
|
||||
|
|
|
|||
|
|
@ -1087,8 +1087,8 @@ static int get_options(int *argc, char ***argv)
|
|||
return(ho_error);
|
||||
|
||||
/*
|
||||
Dumping under --system=stats with --replace or --inser-ignore is safe and will not
|
||||
retult into race condition. Otherwise dump only structure and ignore data by default
|
||||
Dumping under --system=stats with --replace or --insert-ignore is safe and will not
|
||||
result into race condition. Otherwise dump only structure and ignore data by default
|
||||
while dumping.
|
||||
*/
|
||||
if (!(opt_system & OPT_SYSTEM_STATS) && !(opt_ignore || opt_replace_into))
|
||||
|
|
@ -2864,7 +2864,7 @@ static inline my_bool general_log_or_slow_log_tables(const char *db,
|
|||
!my_strcasecmp(charset_info, table, "transaction_registry"));
|
||||
}
|
||||
/*
|
||||
get_sequence_structure-- retrievs sequence structure, prints out corresponding
|
||||
get_sequence_structure-- retrieves sequence structure, prints out corresponding
|
||||
CREATE statement
|
||||
ARGS
|
||||
seq - sequence name
|
||||
|
|
@ -2926,7 +2926,7 @@ static void get_sequence_structure(const char *seq, const char *db)
|
|||
DBUG_VOID_RETURN;
|
||||
}
|
||||
/*
|
||||
get_table_structure -- retrievs database structure, prints out corresponding
|
||||
get_table_structure -- retrieves database structure, prints out corresponding
|
||||
CREATE statement and fills out insert_pat if the table is the type we will
|
||||
be dumping.
|
||||
|
||||
|
|
@ -4531,7 +4531,7 @@ static int dump_all_users_roles_and_grants()
|
|||
echo "$dosomethingspecial"
|
||||
) | mysql -h $host
|
||||
|
||||
doesn't end up with a suprise that the $dosomethingspecial cannot
|
||||
doesn't end up with a surprise that the $dosomethingspecial cannot
|
||||
be done because `special_role` isn't active.
|
||||
|
||||
We create a new role for importing that becomes the default admin for new
|
||||
|
|
@ -4540,8 +4540,8 @@ static int dump_all_users_roles_and_grants()
|
|||
create new admins for the created role.
|
||||
|
||||
At the end of the import the mariadb_dump_import_role is be dropped,
|
||||
which implictly drops all its admin aspects of the dropped role.
|
||||
This is significiantly easlier than revoking the ADMIN of each role
|
||||
which implicitly drops all its admin aspects of the dropped role.
|
||||
This is significantly easier than revoking the ADMIN of each role
|
||||
from the current user.
|
||||
*/
|
||||
fputs("SELECT COALESCE(CURRENT_ROLE(),'NONE') into @current_role;\n"
|
||||
|
|
@ -6960,7 +6960,7 @@ int main(int argc, char **argv)
|
|||
if (opt_system & OPT_SYSTEM_SERVERS)
|
||||
dump_all_servers();
|
||||
|
||||
/* These must be last as they explictly change the current database to mysql */
|
||||
/* These must be last as they explicitly change the current database to mysql */
|
||||
if (opt_system & OPT_SYSTEM_STATS)
|
||||
dump_all_stats();
|
||||
|
||||
|
|
|
|||
|
|
@ -579,7 +579,7 @@ static char *add_load_option(char *ptr, const char *object,
|
|||
/*
|
||||
** Allow the user to specify field terminator strings like:
|
||||
** "'", "\", "\\" (escaped backslash), "\t" (tab), "\n" (newline)
|
||||
** This is done by doubleing ' and add a end -\ if needed to avoid
|
||||
** This is done by doubling ' and add a end -\ if needed to avoid
|
||||
** syntax errors from the SQL parser.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
then reporting the timing of each stage.
|
||||
|
||||
MySQL slap runs three stages:
|
||||
1) Create schema,table, and optionally any SP or data you want to beign
|
||||
1) Create schema,table, and optionally any SP or data you want to begin
|
||||
the test with. (single client)
|
||||
2) Load test (many clients)
|
||||
3) Cleanup (disconnection, drop table if specified, single client)
|
||||
|
|
@ -2033,7 +2033,7 @@ parse_option(const char *origin, option_string **stmt, char delm)
|
|||
char *buffer_ptr;
|
||||
|
||||
/*
|
||||
Return an error if the length of the any of the comma seprated value
|
||||
Return an error if the length of the comma separated values
|
||||
exceeds HUGE_STRING_LENGTH.
|
||||
*/
|
||||
if ((size_t)(retstr - ptr) > HUGE_STRING_LENGTH)
|
||||
|
|
@ -2079,7 +2079,7 @@ parse_option(const char *origin, option_string **stmt, char delm)
|
|||
char *origin_ptr;
|
||||
|
||||
/*
|
||||
Return an error if the length of the any of the comma seprated value
|
||||
Return an error if the length of any of the comma separated values
|
||||
exceeds HUGE_STRING_LENGTH.
|
||||
*/
|
||||
if (strlen(ptr) > HUGE_STRING_LENGTH)
|
||||
|
|
|
|||
|
|
@ -563,10 +563,10 @@ char builtin_echo[FN_REFLEN];
|
|||
|
||||
struct st_replace_regex
|
||||
{
|
||||
DYNAMIC_ARRAY regex_arr; /* stores a list of st_regex subsitutions */
|
||||
DYNAMIC_ARRAY regex_arr; /* stores a list of st_regex substitutions */
|
||||
|
||||
/*
|
||||
Temporary storage areas for substitutions. To reduce unnessary copying
|
||||
Temporary storage areas for substitutions. To reduce unnecessary copying
|
||||
and memory freeing/allocation, we pre-allocate two buffers, and alternate
|
||||
their use, one for input/one for output, the roles changing on the next
|
||||
st_regex substitution. At the end of substitutions buf points to the
|
||||
|
|
@ -1932,7 +1932,7 @@ void show_diff(DYNAMIC_STRING* ds,
|
|||
needs special processing due to return values
|
||||
on that OS
|
||||
This test is only done on Windows since it's only needed there
|
||||
in order to correctly detect non-availibility of 'diff', and
|
||||
in order to correctly detect non-availability of 'diff', and
|
||||
the way it's implemented does not work with default 'diff' on Solaris.
|
||||
*/
|
||||
#ifdef _WIN32
|
||||
|
|
@ -2311,7 +2311,7 @@ static int strip_surrounding(char* str, char c1, char c2)
|
|||
/* Replace it with a space */
|
||||
*ptr= ' ';
|
||||
|
||||
/* Last non space charecter should be c2 */
|
||||
/* Last non space character should be c2 */
|
||||
ptr= strend(str)-1;
|
||||
while(*ptr && my_isspace(charset_info, *ptr))
|
||||
ptr--;
|
||||
|
|
@ -3080,7 +3080,7 @@ void open_file(const char *name)
|
|||
if overlay-dir is specified, and the file is located somewhere
|
||||
under overlay-dir or under suite-dir, the search works as follows:
|
||||
|
||||
0.let suffix be current file dirname relative to siute-dir or overlay-dir
|
||||
0.let suffix be current file dirname relative to suite-dir or overlay-dir
|
||||
1.try in overlay-dir/suffix
|
||||
2.try in suite-dir/suffix
|
||||
3.try in overlay-dir
|
||||
|
|
@ -5593,7 +5593,7 @@ void do_close_connection(struct st_command *command)
|
|||
con->stmt= 0;
|
||||
#ifdef EMBEDDED_LIBRARY
|
||||
/*
|
||||
As query could be still executed in a separate theread
|
||||
As query could be still executed in a separate thread
|
||||
we need to check if the query's thread was finished and probably wait
|
||||
(embedded-server specific)
|
||||
*/
|
||||
|
|
@ -5888,7 +5888,7 @@ void do_connect(struct st_command *command)
|
|||
{ "connection name", ARG_STRING, TRUE, &ds_connection_name, "Name of the connection" },
|
||||
{ "host", ARG_STRING, TRUE, &ds_host, "Host to connect to" },
|
||||
{ "user", ARG_STRING, FALSE, &ds_user, "User to connect as" },
|
||||
{ "passsword", ARG_STRING, FALSE, &ds_password, "Password used when connecting" },
|
||||
{ "password", ARG_STRING, FALSE, &ds_password, "Password used when connecting" },
|
||||
{ "database", ARG_STRING, FALSE, &ds_database, "Database to select after connect" },
|
||||
{ "port", ARG_STRING, FALSE, &ds_port, "Port to connect to" },
|
||||
{ "socket", ARG_STRING, FALSE, &ds_sock, "Socket to connect with" },
|
||||
|
|
@ -6392,7 +6392,7 @@ void do_block(enum block_cmd cmd, struct st_command* command)
|
|||
} else
|
||||
{
|
||||
if (*expr_start != '`' && ! my_isdigit(charset_info, *expr_start))
|
||||
die("Expression in if/while must beging with $, ` or a number");
|
||||
die("Expression in if/while must begin with $, ` or a number");
|
||||
eval_expr(&v, expr_start, &expr_end);
|
||||
}
|
||||
|
||||
|
|
@ -8236,7 +8236,7 @@ void handle_no_error(struct st_command *command)
|
|||
/*
|
||||
Run query using prepared statement C API
|
||||
|
||||
SYNPOSIS
|
||||
SYNOPSIS
|
||||
run_query_stmt
|
||||
mysql - mysql handle
|
||||
command - current command pointer
|
||||
|
|
@ -8471,6 +8471,7 @@ end:
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
|
|
@ -8517,7 +8518,7 @@ int util_query(MYSQL* org_mysql, const char* query){
|
|||
/*
|
||||
Run query
|
||||
|
||||
SYNPOSIS
|
||||
SYNOPSIS
|
||||
run_query()
|
||||
mysql mysql handle
|
||||
command current command pointer
|
||||
|
|
@ -10244,7 +10245,7 @@ err:
|
|||
/*
|
||||
Execute all substitutions on val.
|
||||
|
||||
Returns: true if substituition was made, false otherwise
|
||||
Returns: true if substitution was made, false otherwise
|
||||
Side-effect: Sets r->buf to be the buffer with all substitutions done.
|
||||
|
||||
IN:
|
||||
|
|
@ -10338,7 +10339,7 @@ void free_replace_regex()
|
|||
|
||||
|
||||
/*
|
||||
auxiluary macro used by reg_replace
|
||||
auxiliary macro used by reg_replace
|
||||
makes sure the result buffer has sufficient length
|
||||
*/
|
||||
#define SECURE_REG_BUF if (buf_len < need_buf_len) \
|
||||
|
|
@ -10877,7 +10878,7 @@ int init_sets(REP_SETS *sets,uint states)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* Make help sets invisible for nicer codeing */
|
||||
/* Make help sets invisible for nicer coding */
|
||||
|
||||
void make_sets_invisible(REP_SETS *sets)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -326,7 +326,7 @@ IF(compat53 AND compat101)
|
|||
# RHEL6/CentOS6 install Postfix by default, and it requires
|
||||
# libmysqlclient.so.16 that pulls in mysql-libs-5.1.x
|
||||
# And the latter conflicts with our rpms.
|
||||
# Make sure that for these distribuions all our rpms require
|
||||
# Make sure that for these distributions all our rpms require
|
||||
# MariaDB-compat, that will replace mysql-libs-5.1
|
||||
IF(RPM MATCHES "(rhel|centos)[67]")
|
||||
SET(CPACK_RPM_common_PACKAGE_REQUIRES "MariaDB-compat")
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
# - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory
|
||||
# On Windows :
|
||||
# - add version resource
|
||||
# - instruct CPack to do autenticode signing if SIGNCODE is set
|
||||
# - instruct CPack to do authenticode signing if SIGNCODE is set
|
||||
|
||||
INCLUDE(CMakeParseArguments)
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ MACRO (FIND_CURSES)
|
|||
remove CMakeCache.txt and rerun cmake.")
|
||||
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
SET(ERRORMSG ${ERRORMSG}
|
||||
"On Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates "
|
||||
"On Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivatives "
|
||||
"it is ncurses-devel.")
|
||||
ENDIF()
|
||||
MESSAGE(FATAL_ERROR ${ERRORMSG})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# If timestamping is used, it can (rarely) fail, when public timestamping service has issues.
|
||||
#
|
||||
# To handle the error gracefully and tranparently, we'll retry the signtool command,
|
||||
# To handle the error gracefully and transparently, we'll retry the signtool command,
|
||||
# second time without "/t URL" parameter
|
||||
SET(SIGNTOOL_PARAMETERS_NO_TIMESTAMP "@SIGNTOOL_PARAMETERS@")
|
||||
LIST(FIND SIGNTOOL_PARAMETERS_NO_TIMESTAMP /t idx)
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ ENDMACRO()
|
|||
#
|
||||
# Provides the following configure options:
|
||||
# WITH_ZLIB_BUNDLED
|
||||
# If this is set,we use bindled zlib
|
||||
# If this is set,we use bundled zlib
|
||||
# If this is not set,search for system zlib.
|
||||
# if system zlib is not found, use bundled copy
|
||||
# ZLIB_LIBRARIES, ZLIB_INCLUDE_DIR and ZLIB_SOURCES
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
*
|
||||
* Michael Widenius:
|
||||
* DBUG_DUMP - To dump a block of memory.
|
||||
* PUSH_FLAG "O" - To be used insted of "o" if we
|
||||
* PUSH_FLAG "O" - To be used instead of "o" if we
|
||||
* want flushing after each write
|
||||
* PUSH_FLAG "A" - as 'O', but we will append to the out file instead
|
||||
* of creating a new one.
|
||||
|
|
|
|||
|
|
@ -847,7 +847,7 @@ EX:\fC
|
|||
Unlocks DBUG_FILE stream, that was locked with a DBUG_LOCK_FILE.
|
||||
.LI DBUG_ASSERT\
|
||||
This macro just does a regular assert(). The difference is that it will be
|
||||
disabled by DBUG_OFF togeher with the
|
||||
disabled by DBUG_OFF together with the
|
||||
.I dbug
|
||||
library. So there will be no need to disable asserts separately with NDEBUG.
|
||||
.SP 1
|
||||
|
|
@ -1115,7 +1115,7 @@ will usually have problems using the standard
|
|||
package.
|
||||
The most common problem is multiply allocated memory.
|
||||
.SP 2
|
||||
.\" .DE nroff dident like this. davida 900108
|
||||
.\" .DE nroff didn't like this. davida 900108
|
||||
.CS
|
||||
|
||||
.\" vim:filetype=nroff
|
||||
|
|
|
|||
|
|
@ -500,7 +500,7 @@ anything goes
|
|||
0 != string
|
||||
mysqltest: At line 2: Only == and != are supported for string values
|
||||
mysqltest: At line 2: Found junk '~= 6' after $variable in condition
|
||||
mysqltest: At line 2: Expression in if/while must beging with $, ` or a number
|
||||
mysqltest: At line 2: Expression in if/while must begin with $, ` or a number
|
||||
mysqltest: At line 1: Missing right operand in comparison
|
||||
mysqltest: At line 1: Missing right operand in comparison
|
||||
counter is 2
|
||||
|
|
|
|||
|
|
@ -1206,7 +1206,7 @@ void Query_cache::end_of_result(THD *thd)
|
|||
BLOCK_LOCK_WR(query_block);
|
||||
Query_cache_query *header= query_block->query();
|
||||
Query_cache_block *last_result_block;
|
||||
size_t allign_size;
|
||||
size_t align_size;
|
||||
size_t len;
|
||||
|
||||
if (header->result() == 0)
|
||||
|
|
@ -1224,8 +1224,8 @@ void Query_cache::end_of_result(THD *thd)
|
|||
DBUG_VOID_RETURN;
|
||||
}
|
||||
last_result_block= header->result()->prev;
|
||||
allign_size= ALIGN_SIZE(last_result_block->used);
|
||||
len= MY_MAX(query_cache.min_allocation_unit, allign_size);
|
||||
align_size= ALIGN_SIZE(last_result_block->used);
|
||||
len= MY_MAX(query_cache.min_allocation_unit, align_size);
|
||||
if (last_result_block->length >= query_cache.min_allocation_unit + len)
|
||||
query_cache.split_block(last_result_block,len);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue