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 | ceeaa24d187b228fd6e8b1ac1e667d341155640f (patch) | |
| tree | 54b32bf1935af765ea1bb9b118082d9ce067d4c0 /sql/sql_help.cc | |
| parent | db9fde085fdbdacd48760c0243805e8df8b39a8c (diff) | |
| download | mariadb-git-ceeaa24d187b228fd6e8b1ac1e667d341155640f.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_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index f6bae67c3b6..980ed4047f3 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -731,12 +731,12 @@ int mysqld_help(THD *thd, const char *mask) &categories_list,&category_id); if (!count_categories) { - if (send_header_2(protocol,false)) + if (send_header_2(protocol,FALSE)) goto end; } else if (count_categories > 1) { - if (send_header_2(protocol,false) || + if (send_header_2(protocol,FALSE) || send_variant_2_list(mem_root,protocol,&categories_list,"Y",0)) goto end; } @@ -780,7 +780,7 @@ int mysqld_help(THD *thd, const char *mask) else { /* First send header and functions */ - if (send_header_2(protocol, false) || + if (send_header_2(protocol, FALSE) || send_variant_2_list(mem_root,protocol, &topics_list, "N", 0)) goto end; search_categories(thd, tables[1].table, used_fields, |