Skip to content

Commit ca40f58

Browse files
committed
Bug#33615013 Fix Doxygen warnings reported by Doxygen v1.9.2
Fix new doxygen warnings reported by Doxygen 1.9.2. Change-Id: Iaf4096f3eeb7eb9e298d728a97fc715b86104381
1 parent 65da289 commit ca40f58

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

sql/auth/sql_auth_cache.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ void append_auth_id(const THD *thd, ACL_USER *acl_user, String *str) {
699699
}
700700

701701
/**
702-
Append the user@host to the str
702+
Append the user\@host to the str.
703703
704704
@param [in] thd The THD to find the SQL mode
705705
@param [in] user Username to append to authID

sql/auth/sql_authentication.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4325,7 +4325,7 @@ static int compare_native_password_with_hash(const char *hash,
43254325
The server name is *mysql_native_password*
43264326
</li>
43274327
<li>
4328-
The client name is *mysql_native_password"
4328+
The client name is *mysql_native_password*
43294329
</li>
43304330
<li>
43314331
Client side requires an 20-byte random challenge from server
@@ -4347,7 +4347,7 @@ static int compare_native_password_with_hash(const char *hash,
43474347
@ref page_protocol_connection_phase_authentication_methods_old_password_authentication
43484348
43494349
1. using a tested, crypto-graphic hashing function (SHA1)
4350-
2. knowning the content of the hash in the mysql.user table isn't enough
4350+
2. knowing the content of the hash in the mysql.user table isn't enough
43514351
to authenticate against the MySQL Server.
43524352
43534353
The network packet content for the password is calculated by:

sql/coding_guidelines.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
137137
<em>* **********</em>/</pre>
138138
</td></tr></table></div>
139139
140-
- When writing single-line comments, the '/<em>*</em>' and '<em>*</em>/" are
140+
- When writing single-line comments, the '/<em>*</em>' and '<em>*</em>/' are
141141
on the same line. For example:
142142
143143
<div style="margin-left:30px">

sql/item.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3846,7 +3846,7 @@ class Item_ident : public Item {
38463846
If column is from an expression, a string generated from that expression.
38473847
38483848
Notice that a column can be aliased in two ways:
3849-
1. With an explicit column alias, or <as clause>, or
3849+
1. With an explicit column alias, or @<as clause@>, or
38503850
2. With only a column name specified, which differs from the table's
38513851
column name due to case insensitivity.
38523852
In both cases field_name will differ from m_orig_field_name.

sql/regexp/errors.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ struct UErrorCodeHash {
5151
Map from ICU error codes to MySQL dittos. We strive to keep this list in the
5252
same order as the enum UErrorCode in common/unicode/utypes.h.
5353
54-
ICU version 67 introduced a new implementation for '\X'
54+
ICU version 67 introduced a new implementation for '@\X'
5555
"Match a Grapheme Cluster". This means that our bundled version will
5656
return ER_REGEXP_MISSING_RESOURCE while for system ICU we return
5757
ER_WARN_REGEXP_USING_DEFAULT as a Note.

0 commit comments

Comments
 (0)