diff options
| author | unknown <monty@mysql.com> | 2004-03-30 02:32:41 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-30 02:32:41 +0300 |
| commit | a035472991ac801f77be073fe2671385fd32f6e9 (patch) | |
| tree | 54b32bf1935af765ea1bb9b118082d9ce067d4c0 /sql/sql_acl.cc | |
| parent | 5161094a6668e1e2e5b2f4b59a5a41207aecfd3b (diff) | |
| download | mariadb-git-a035472991ac801f77be073fe2671385fd32f6e9.tar.gz | |
false/true -> FALSE/TRUE
Fixes after last merge
mysql-test/r/bdb-crash.result:
fixed bad merge
mysql-test/r/myisam.result:
after merge fix
mysql-test/r/order_by.result:
fixed bad merge
mysql-test/t/order_by.test:
after merge fix
sql/field_conv.cc:
false/true -> FALSE/TRUE
sql/handler.cc:
false/true -> FALSE/TRUE
sql/item.cc:
false/true -> FALSE/TRUE
sql/item_cmpfunc.cc:
false/true -> FALSE/TRUE
sql/item_sum.cc:
false/true -> FALSE/TRUE
sql/slave.cc:
false/true -> FALSE/TRUE
sql/sql_acl.cc:
false/true -> FALSE/TRUE
sql/sql_cache.cc:
after merge fix
sql/sql_help.cc:
false/true -> FALSE/TRUE
sql/sql_olap.cc:
false/true -> FALSE/TRUE
sql/sql_parse.cc:
false/true -> FALSE/TRUE
sql/sql_select.cc:
fix after bad merge
sql/sql_table.cc:
fix after bad merge
sql/sql_test.cc:
false/true -> FALSE/TRUE
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 9284b1cd574..ef5036bb9f1 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1293,20 +1293,20 @@ bool hostname_requires_resolving(const char *hostname) { char cur; if (!hostname) - return false; + return FALSE; int namelen= strlen(hostname); int lhlen= strlen(my_localhost); if ((namelen == lhlen) && !my_strnncoll(&my_charset_latin1, (const uchar *)hostname, namelen, (const uchar *)my_localhost, strlen(my_localhost))) - return false; + return FALSE; for (; (cur=*hostname); hostname++) { if ((cur != '%') && (cur != '_') && (cur != '.') && ((cur < '0') || (cur > '9'))) - return true; + return TRUE; } - return false; + return FALSE; } /* |