1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

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
This commit is contained in:
unknown
2004-03-30 02:32:41 +03:00
parent db9fde085f
commit ceeaa24d18
18 changed files with 165 additions and 67 deletions

View File

@ -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,