mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Client spelling mistakes
This commit is contained in:
@ -1298,8 +1298,8 @@ sig_handler mysql_end(int sig)
|
||||
{
|
||||
#ifndef _WIN32
|
||||
/*
|
||||
Ingnoring SIGQUIT and SIGINT signals when cleanup process starts.
|
||||
This will help in resolving the double free issues, which occures in case
|
||||
Ignoring SIGQUIT and SIGINT signals when cleanup process starts.
|
||||
This will help in resolving the double free issues, which occurs in case
|
||||
the signal handler function is started in between the clean up function.
|
||||
*/
|
||||
signal(SIGQUIT, SIG_IGN);
|
||||
@ -4721,7 +4721,7 @@ sql_real_connect(char *host,char *database,char *user,char *password,
|
||||
mysql.reconnect= debug_info_flag; // We want to know if this happens
|
||||
|
||||
/*
|
||||
CLIENT_PROGRESS is set only if we requsted it in mysql_real_connect()
|
||||
CLIENT_PROGRESS is set only if we requested it in mysql_real_connect()
|
||||
and the server also supports it
|
||||
*/
|
||||
if (mysql.client_flag & CLIENT_PROGRESS)
|
||||
@ -4789,7 +4789,7 @@ com_status(String *buffer __attribute__((unused)),
|
||||
tee_fprintf(stdout, "\nConnection id:\t\t%lu\n",mysql_thread_id(&mysql));
|
||||
/*
|
||||
Don't remove "limit 1",
|
||||
it is protection againts SQL_SELECT_LIMIT=0
|
||||
it is protection against SQL_SELECT_LIMIT=0
|
||||
*/
|
||||
if (!mysql_store_result_for_lazy(&result))
|
||||
{
|
||||
@ -5162,7 +5162,7 @@ static const char *construct_prompt()
|
||||
time_t lclock = time(NULL); // Get the date struct
|
||||
struct tm *t = localtime(&lclock);
|
||||
|
||||
/* parse thru the settings for the prompt */
|
||||
/* parse through the settings for the prompt */
|
||||
for (char *c = current_prompt; *c ; c++)
|
||||
{
|
||||
if (*c != PROMPT_CHAR)
|
||||
|
@ -1019,7 +1019,7 @@ static int find_plugin(char *tp_path)
|
||||
|
||||
|
||||
/**
|
||||
Build the boostrap file.
|
||||
Build the bootstrap file.
|
||||
|
||||
Create a new file and populate it with SQL commands to ENABLE or DISABLE
|
||||
the plugin via REPLACE and DELETE operations on the mysql.plugin table.
|
||||
@ -1148,7 +1148,7 @@ exit:
|
||||
|
||||
Create a command line sequence to launch mysqld in bootstrap mode. This
|
||||
will allow mysqld to launch a minimal server instance to read and
|
||||
execute SQL commands from a file piped in (the boostrap file). We use
|
||||
execute SQL commands from a file piped in (the bootstrap file). We use
|
||||
the --no-defaults option to skip reading values from the config file.
|
||||
|
||||
The bootstrap mode skips loading of plugins and many other subsystems.
|
||||
|
@ -725,7 +725,7 @@ static bool shall_skip_database(const char *log_dbname)
|
||||
/**
|
||||
Print "use <db>" statement when current db is to be changed.
|
||||
|
||||
We have to control emiting USE statements according to rewrite-db options.
|
||||
We have to control emitting USE statements according to rewrite-db options.
|
||||
We have to do it here (see process_event() below) and to suppress
|
||||
producing USE statements by corresponding log event print-functions.
|
||||
*/
|
||||
@ -757,7 +757,7 @@ print_use_stmt(PRINT_EVENT_INFO* pinfo, const Query_log_event *ev)
|
||||
// In case of rewrite rule print USE statement for db_to
|
||||
my_fprintf(result_file, "use %`s%s\n", db_to, pinfo->delimiter);
|
||||
|
||||
// Copy the *original* db to pinfo to suppress emiting
|
||||
// Copy the *original* db to pinfo to suppress emitting
|
||||
// of USE stmts by log_event print-functions.
|
||||
memcpy(pinfo->db, db, db_len + 1);
|
||||
}
|
||||
|
@ -143,7 +143,7 @@ static char * opt_mysql_unix_port=0;
|
||||
static int first_error=0;
|
||||
/*
|
||||
multi_source is 0 if old server or 2 if server that support multi source
|
||||
This is choosen this was as multi_source has 2 extra columns first in
|
||||
This is chosen this was as multi_source has 2 extra columns first in
|
||||
SHOW ALL SLAVES STATUS.
|
||||
*/
|
||||
static uint multi_source= 0;
|
||||
@ -2035,7 +2035,7 @@ static void print_xml_tag(FILE * xml_file, const char* sbeg,
|
||||
<stag_atr="sval" xsi:nil="true"/>
|
||||
NOTE
|
||||
sval MUST be a NULL terminated string.
|
||||
sval string will be qouted before output.
|
||||
sval string will be quoted before output.
|
||||
*/
|
||||
|
||||
static void print_xml_null_tag(FILE * xml_file, const char* sbeg,
|
||||
@ -2107,7 +2107,7 @@ static void print_xml_cdata(FILE *xml_file, const char *str, ulong len)
|
||||
Print tag with many attribute to the xml_file. Format is:
|
||||
\t\t<row_name Atr1="Val1" Atr2="Val2"... />
|
||||
NOTE
|
||||
All atributes and values will be quoted before output.
|
||||
All attributes and values will be quoted before output.
|
||||
*/
|
||||
|
||||
static void print_xml_row(FILE *xml_file, const char *row_name,
|
||||
@ -2578,7 +2578,7 @@ static uint dump_routines_for_db(char *db)
|
||||
print_comment(sql_file, 1,
|
||||
"-- does %s have permissions on mysql.proc?\n\n",
|
||||
fix_for_comment(current_user));
|
||||
maybe_die(EX_MYSQLERR,"%s has insufficent privileges to %s!",
|
||||
maybe_die(EX_MYSQLERR,"%s has insufficient privileges to %s!",
|
||||
current_user, query_buff);
|
||||
}
|
||||
else if (strlen(row[2]))
|
||||
@ -4071,7 +4071,7 @@ static void dump_table(char *table, char *db, const uchar *hash_key, size_t len)
|
||||
}
|
||||
}
|
||||
|
||||
/* XML - close table tag and supress regular output */
|
||||
/* XML - close table tag and suppress regular output */
|
||||
if (opt_xml)
|
||||
fputs("\t</table_data>\n", md_result_file);
|
||||
else if (extended_insert && row_break)
|
||||
@ -4477,7 +4477,7 @@ static int dump_databases(char **db_names)
|
||||
|
||||
|
||||
/*
|
||||
View Specific database initalization.
|
||||
View Specific database initialization.
|
||||
|
||||
SYNOPSIS
|
||||
init_dumping_views
|
||||
@ -4494,7 +4494,7 @@ int init_dumping_views(char *qdatabase __attribute__((unused)))
|
||||
|
||||
|
||||
/*
|
||||
Table Specific database initalization.
|
||||
Table Specific database initialization.
|
||||
|
||||
SYNOPSIS
|
||||
init_dumping_tables
|
||||
@ -6179,7 +6179,7 @@ int main(int argc, char **argv)
|
||||
goto err;
|
||||
|
||||
/*
|
||||
No reason to explicitely COMMIT the transaction, neither to explicitely
|
||||
No reason to explicitly COMMIT the transaction, neither to explicitly
|
||||
UNLOCK TABLES: these will be automatically be done by the server when we
|
||||
disconnect now. Saves some code here, some network trips, adds nothing to
|
||||
server.
|
||||
|
@ -589,7 +589,7 @@ static char *field_escape(char *to,const char *from,uint length)
|
||||
else
|
||||
{
|
||||
if (*from == '\'' && !end_backslashes)
|
||||
*to++= *from; /* We want a dublicate of "'" for MySQL */
|
||||
*to++= *from; /* We want a duplicate of "'" for MySQL */
|
||||
end_backslashes=0;
|
||||
}
|
||||
}
|
||||
|
@ -2302,7 +2302,7 @@ slap_connect(MYSQL *mysql)
|
||||
opt_mysql_unix_port,
|
||||
connect_flags))
|
||||
{
|
||||
/* Connect suceeded */
|
||||
/* Connect succeeded */
|
||||
connect_error= 0;
|
||||
break;
|
||||
}
|
||||
|
@ -145,7 +145,7 @@ struct property {
|
||||
my_bool *var; /* Actual variable */
|
||||
my_bool set; /* Has been set for ONE command */
|
||||
my_bool old; /* If set, thus is the old value */
|
||||
my_bool reverse; /* Varible is true if disabled */
|
||||
my_bool reverse; /* Variable is true if disabled */
|
||||
const char *env_name; /* Env. variable name */
|
||||
};
|
||||
|
||||
@ -555,7 +555,7 @@ DYNAMIC_ARRAY regex_arr; /* stores a list of st_regex subsitutions */
|
||||
Temporary storage areas for substitutions. To reduce unnessary 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 substition. At the end of substitutions buf points to the
|
||||
st_regex substitution. At the end of substitutions buf points to the
|
||||
one containing the final result.
|
||||
*/
|
||||
char* buf;
|
||||
@ -3056,7 +3056,7 @@ void open_file(const char *name)
|
||||
strxnmov(buff, sizeof(buff), opt_overlay_dir, suffix, name, NullS);
|
||||
|
||||
/*
|
||||
Overlayed rty/include/thing.inc can contain the line
|
||||
Overlaid rty/include/thing.inc can contain the line
|
||||
--source thing.inc
|
||||
which would mean to include qwe/include/thing.inc.
|
||||
But it looks like including "itself", so don't try to open the file,
|
||||
@ -3958,7 +3958,7 @@ static int rmtree(const char *dir)
|
||||
#ifdef _WIN32
|
||||
/*
|
||||
On Windows, check and possible reset readonly attribute.
|
||||
my_delete(), or DeleteFile does not remove theses files.
|
||||
my_delete(), or DeleteFile does not remove these files.
|
||||
*/
|
||||
if (err)
|
||||
{
|
||||
@ -4840,7 +4840,7 @@ int do_save_master_pos()
|
||||
mysql_errno(mysql), mysql_error(mysql));
|
||||
|
||||
if (!(res = mysql_store_result(mysql)))
|
||||
die("mysql_store_result() retuned NULL for '%s'", query);
|
||||
die("mysql_store_result() returned NULL for '%s'", query);
|
||||
if (!(row = mysql_fetch_row(res)))
|
||||
die("empty result in show master status");
|
||||
strnmov(master_pos.file, row[0], sizeof(master_pos.file)-1);
|
||||
@ -5358,7 +5358,7 @@ void do_get_errcodes(struct st_command *command)
|
||||
p++;
|
||||
}
|
||||
|
||||
/* Convert the sting to int */
|
||||
/* Convert the string to int */
|
||||
if (!str2int(start, 10, (long) INT_MIN, (long) INT_MAX, &val))
|
||||
die("Invalid argument to error: '%s'", command->first_argument);
|
||||
|
||||
@ -5766,7 +5766,7 @@ int connect_n_handle_errors(struct st_command *command,
|
||||
dynstr_append_mem(ds, delimiter, delimiter_length);
|
||||
dynstr_append_mem(ds, "\n", 1);
|
||||
}
|
||||
/* Simlified logging if enabled */
|
||||
/* Simplified logging if enabled */
|
||||
if (!disable_connect_log && !disable_query_log)
|
||||
{
|
||||
replace_dynstr_append(ds, command->query);
|
||||
@ -8130,7 +8130,7 @@ void handle_no_error(struct st_command *command)
|
||||
SYNPOSIS
|
||||
run_query_stmt
|
||||
mysql - mysql handle
|
||||
command - currrent command pointer
|
||||
command - current command pointer
|
||||
query - query string to execute
|
||||
query_len - length query string to execute
|
||||
ds - output buffer where to store result form query
|
||||
@ -8358,7 +8358,7 @@ end:
|
||||
/*
|
||||
Create a util connection if one does not already exists
|
||||
and use that to run the query
|
||||
This is done to avoid implict commit when creating/dropping objects such
|
||||
This is done to avoid implicit commit when creating/dropping objects such
|
||||
as view, sp etc.
|
||||
*/
|
||||
|
||||
@ -8399,7 +8399,7 @@ int util_query(MYSQL* org_mysql, const char* query){
|
||||
SYNPOSIS
|
||||
run_query()
|
||||
mysql mysql handle
|
||||
command currrent command pointer
|
||||
command current command pointer
|
||||
|
||||
flags control the phased/stages of query execution to be performed
|
||||
if QUERY_SEND_FLAG bit is on, the query will be sent. If QUERY_REAP_FLAG
|
||||
@ -10155,7 +10155,7 @@ int multi_reg_replace(struct st_replace_regex* r,char* val)
|
||||
if (!reg_replace(&out_buf, buf_len_p, re.pattern, re.replace,
|
||||
in_buf, re.icase))
|
||||
{
|
||||
/* if the buffer has been reallocated, make adjustements */
|
||||
/* if the buffer has been reallocated, make adjustments */
|
||||
if (save_out_buf != out_buf)
|
||||
{
|
||||
if (save_out_buf == r->even_buf)
|
||||
@ -10420,7 +10420,7 @@ typedef struct st_rep_set {
|
||||
uint found_len; /* Best match to date */
|
||||
int found_offset;
|
||||
uint table_offset;
|
||||
uint size_of_bits; /* For convinience */
|
||||
uint size_of_bits; /* For convenience */
|
||||
} REP_SET;
|
||||
|
||||
typedef struct st_rep_sets {
|
||||
@ -10523,7 +10523,7 @@ REPLACE *init_replace(char * *from, char * *to,uint count,
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
(void) make_new_set(&sets); /* Set starting set */
|
||||
make_sets_invisible(&sets); /* Hide previus sets */
|
||||
make_sets_invisible(&sets); /* Hide previous sets */
|
||||
used_sets=-1;
|
||||
word_states=make_new_set(&sets); /* Start of new word */
|
||||
start_states=make_new_set(&sets); /* This is first state */
|
||||
|
Reference in New Issue
Block a user