diff options
| author | unknown <monty@mishka.local> | 2005-08-22 01:13:37 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-08-22 01:13:37 +0300 |
| commit | 72340a481a4706674780b898b81a1850a6654d3d (patch) | |
| tree | 7f70f119d33fc85a848fcbc2acd1eba3d91b6e17 /sql/item_cmpfunc.cc | |
| parent | a1820ab1caa44ebde992b587cb561dc38da4c9c6 (diff) | |
| download | mariadb-git-72340a481a4706674780b898b81a1850a6654d3d.tar.gz | |
Cleanup during review of new pushed code
include/my_global.h:
Safer macros to avoid possible overflows
sql/item_cmpfunc.cc:
Simple optimization
sql/sp_head.cc:
Indentation fixes
Remove not needed "else" levels
Added error checking for 'new'
Simpler reseting of thd->spcont in execute_procedure
sql/sql_base.cc:
Faster new
sql/sql_lex.cc:
Use 'TRUE' instead of 'true'
sql/sql_parse.cc:
Faster new
sql/sql_view.cc:
No need to set 'tables' as it's not used
sql/table.cc:
Simpler DBUG_ASSERT()
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 1bae5f1c9af..9443a2949d8 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -630,7 +630,7 @@ int Arg_comparator::compare_row() owner->null_value= 0; res= 0; // continue comparison (maybe we will meet explicit difference) } - if (res) + else if (res) return res; } if (was_null) @@ -645,6 +645,7 @@ int Arg_comparator::compare_row() return 0; } + int Arg_comparator::compare_e_row() { (*a)->bring_value(); |