diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-06-14 16:43:08 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-14 16:43:08 +0400 |
| commit | 5b008d4a270d5c1f2ca713d8a96c488c0f96bdd1 (patch) | |
| tree | 80e9f74e0d1f9a7ccaef6d541c0d7d4827d6381f /sql/sql_yacc.yy | |
| parent | 9f9eb682d54fedf38e02df1d28228e68c10ee77d (diff) | |
| parent | effbe7dd7bdf4d27cb8764140a6d00c0b53af0b6 (diff) | |
| download | mariadb-git-5b008d4a270d5c1f2ca713d8a96c488c0f96bdd1.tar.gz | |
Merge pull request #181 from ottok/ok-debpkg-10.2
General spell fixing in comments and strings
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index be426ad7c43..7ab11716f93 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2451,9 +2451,9 @@ master_file_def: If the user specified a value < BIN_LOG_HEADER_SIZE, adjust it instead of causing subsequent errors. We need to do it in this file, because only there we know that - MASTER_LOG_POS has been explicitely specified. On the contrary + MASTER_LOG_POS has been explicitly specified. On the contrary in change_master() (sql_repl.cc) we cannot distinguish between 0 - (MASTER_LOG_POS explicitely specified as 0) and 0 (unspecified), + (MASTER_LOG_POS explicitly specified as 0) and 0 (unspecified), whereas we want to distinguish (specified 0 means "read the binlog from 0" (4 in fact), unspecified means "don't change the position (keep the preceding value)"). @@ -8097,7 +8097,7 @@ checksum: { LEX *lex=Lex; lex->sql_command = SQLCOM_CHECKSUM; - /* Will be overriden during execution. */ + /* Will be overridden during execution. */ YYPS->m_lock_type= TL_UNLOCK; } table_list opt_checksum_type @@ -8123,7 +8123,7 @@ repair: lex->no_write_to_binlog= $2; lex->check_opt.init(); lex->alter_info.reset(); - /* Will be overriden during execution. */ + /* Will be overridden during execution. */ YYPS->m_lock_type= TL_UNLOCK; } repair_table_or_view @@ -8165,7 +8165,7 @@ analyze: lex->no_write_to_binlog= $2; lex->check_opt.init(); lex->alter_info.reset(); - /* Will be overriden during execution. */ + /* Will be overridden during execution. */ YYPS->m_lock_type= TL_UNLOCK; } analyze_table_list @@ -8287,7 +8287,7 @@ check: CHECK_SYM lex->sql_command = SQLCOM_CHECK; lex->check_opt.init(); lex->alter_info.reset(); - /* Will be overriden during execution. */ + /* Will be overridden during execution. */ YYPS->m_lock_type= TL_UNLOCK; } check_view_or_table @@ -8337,7 +8337,7 @@ optimize: lex->no_write_to_binlog= $2; lex->check_opt.init(); lex->alter_info.reset(); - /* Will be overriden during execution. */ + /* Will be overridden during execution. */ YYPS->m_lock_type= TL_UNLOCK; } table_list |