diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-10-08 21:50:05 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-10-08 21:50:05 +0300 |
| commit | d1d07c99d7dc1f443776a48e66aa471b3b4535e4 (patch) | |
| tree | caac541df5c696ac2dd3b9e21880442e8961b4dc /sql/opt_range.cc | |
| parent | 44e3cbcfeb14dd45b2eea154a8a602a5851cfac9 (diff) | |
| download | mariadb-git-d1d07c99d7dc1f443776a48e66aa471b3b4535e4.tar.gz | |
Indentation cleanups
Remove wait_if_global_read_lock on commit as this can cause deadlocks
BUILD/FINISH.sh:
Cleanup
BUILD/SETUP.sh:
Cleanup
BUILD/compile-pentium-valgrind-max:
Don't write message twice
mysql-test/r/innodb.result:
Removed failure as this can cause deadlocks
mysql-test/r/rpl_max_relay_size.result:
Make test repeatable
mysql-test/t/innodb.test:
Removed failure as this can cause deadlocks
mysql-test/t/rpl_max_relay_size.test:
Removed failure as this can cause deadlocks
sql/handler.cc:
Remove wait_if_global_read_lock as this can cause deadlocks
sql/opt_range.cc:
Indentation cleanup
sql/sql_db.cc:
Comment cleanup
sql/sql_parse.cc:
Comment cleanup
sql/sql_repl.cc:
Indentation cleanup
sql/sql_select.cc:
Indentation cleanup
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 5b1e2c98001..24768537e3d 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -456,7 +456,7 @@ SEL_ARG *SEL_ARG::clone(SEL_ARG *new_parent,SEL_ARG **next_arg) SEL_ARG *tmp; if (type != KEY_RANGE) { - if(!(tmp=new SEL_ARG(type))) + if (!(tmp=new SEL_ARG(type))) return 0; // out of memory tmp->prev= *next_arg; // Link into next/prev chain (*next_arg)->next=tmp; @@ -464,7 +464,7 @@ SEL_ARG *SEL_ARG::clone(SEL_ARG *new_parent,SEL_ARG **next_arg) } else { - if(!(tmp=new SEL_ARG(field,part, min_value,max_value, + if (!(tmp=new SEL_ARG(field,part, min_value,max_value, min_flag, max_flag, maybe_flag))) return 0; // out of memory tmp->parent=new_parent; @@ -920,7 +920,7 @@ get_mm_parts(PARAM *param, Field *field, Item_func::Functype type, } else { // This key may be used later - if(!(sel_arg=new SEL_ARG(SEL_ARG::MAYBE_KEY))) + if (!(sel_arg=new SEL_ARG(SEL_ARG::MAYBE_KEY))) DBUG_RETURN(0); // out of memory } sel_arg->part=(uchar) key_part->part; @@ -1488,7 +1488,7 @@ key_or(SEL_ARG *key1,SEL_ARG *key2) SEL_ARG *key2_next=key2->next; if (key2_shared) { - if(!(key2=new SEL_ARG(*key2))) + if (!(key2=new SEL_ARG(*key2))) return 0; // out of memory key2->increment_use_count(key1->use_count+1); key2->next=key2_next; // New copy of key2 @@ -2333,7 +2333,7 @@ get_quick_keys(PARAM *param,QUICK_SELECT *quick,KEY_PART *key, } /* Get range for retrieving rows in QUICK_SELECT::get_next */ - if(!(range= new QUICK_RANGE(param->min_key, + if (!(range= new QUICK_RANGE(param->min_key, (uint) (tmp_min_key - param->min_key), param->max_key, (uint) (tmp_max_key - param->max_key), |