Skip to content

M
mariadb
Commit edfc33be authored by unknown's avatar unknown
Browse files
Options

Merge mysql.com:/home/my/mysql-5.0 

into  mysql.com:/home/my/mysql-5.1


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_lex.cc:
  manual merge
parents 80d86948 afe47152
Show whitespace changes
Inline Side-by-side
Showing with 128 additions and 55 deletions
mysql-test/lib/mtr_report.pl
View file @ edfc33be
...@@ -157,6 +157,7 @@ sub mtr_report_stats ($) { ...@@ -157,6 +157,7 @@ sub mtr_report_stats ($) {
my $tot_passed= 0; my $tot_passed= 0;
my $tot_failed= 0; my $tot_failed= 0;
my $tot_tests= 0; my $tot_tests= 0;
my $found_problems= 0; # Some warnings are errors...
foreach my $tinfo (@$tests) foreach my $tinfo (@$tests)
{ {
...@@ -214,8 +215,6 @@ sub mtr_report_stats ($) { ...@@ -214,8 +215,6 @@ sub mtr_report_stats ($) {
} }
else else
{ {
my $found_problems= 0; # Some warnings are errors...
# We report different types of problems in order # We report different types of problems in order
foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x", foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x",
"InnoDB: Warning", "missing DBUG_RETURN", "InnoDB: Warning", "missing DBUG_RETURN",
...@@ -268,6 +267,9 @@ sub mtr_report_stats ($) { ...@@ -268,6 +267,9 @@ sub mtr_report_stats ($) {
} }
} }
print "\n"; print "\n";
}
if ( $tot_failed != 0 || $found_problems)
{
mtr_error("there where failing test cases"); mtr_error("there where failing test cases");
} }
} }
......
mysql-test/mysql-test-run.sh
View file @ edfc33be
...@@ -205,6 +205,7 @@ TOT_SKIP=0 ...@@ -205,6 +205,7 @@ TOT_SKIP=0
TOT_PASS=0 TOT_PASS=0
TOT_FAIL=0 TOT_FAIL=0
TOT_TEST=0 TOT_TEST=0
GOT_WARNINGS=0
USERT=0 USERT=0
SYST=0 SYST=0
REALT=0 REALT=0
...@@ -1077,17 +1078,16 @@ report_stats () { ...@@ -1077,17 +1078,16 @@ report_stats () {
| $SED -e 's!Warning: Table:.* on rename!!g' \ | $SED -e 's!Warning: Table:.* on rename!!g' \
> $MY_LOG_DIR/warnings.tmp > $MY_LOG_DIR/warnings.tmp
found_error=0
# Find errors # Find errors
for i in "^Warning:" "^Error:" "^==.* at 0x" "InnoDB: Warning" "missing DBUG_RETURN" "mysqld: Warning" for i in "^Warning:" "^Error:" "^==.* at 0x" "InnoDB: Warning" "missing DBUG_RETURN" "mysqld: Warning"
do do
if $GREP "$i" $MY_LOG_DIR/warnings.tmp >> $MY_LOG_DIR/warnings if $GREP "$i" $MY_LOG_DIR/warnings.tmp >> $MY_LOG_DIR/warnings
then then
found_error=1 GOT_WARNINGS=1
fi fi
done done
$RM -f $MY_LOG_DIR/warnings.tmp $RM -f $MY_LOG_DIR/warnings.tmp
if [ $found_error = "1" ] if [ $GOT_WARNINGS = "1" ]
then then
echo "WARNING: Got errors/warnings while running tests. Please examine" echo "WARNING: Got errors/warnings while running tests. Please examine"
echo "$MY_LOG_DIR/warnings for details." echo "$MY_LOG_DIR/warnings for details."
...@@ -2300,6 +2300,8 @@ if [ $TOT_FAIL -ne 0 ]; then ...@@ -2300,6 +2300,8 @@ if [ $TOT_FAIL -ne 0 ]; then
$ECHO "mysql-test-run in $TEST_MODE mode: *** Failing the test(s):$FAILED_CASES" $ECHO "mysql-test-run in $TEST_MODE mode: *** Failing the test(s):$FAILED_CASES"
$ECHO $ECHO
exit 1 exit 1
else
exit 0
fi fi
if [ $GOT_WARNINGS -ne 0 ]; then
exit 1
fi
exit 0
mysql-test/r/delete.result
View file @ edfc33be
...@@ -186,8 +186,8 @@ a b a b a b ...@@ -186,8 +186,8 @@ a b a b a b
explain select * from t1,t2,t3 where t1.a=t2.a AND t2.b=t3.a and t1.b=t3.b; explain select * from t1,t2,t3 where t1.a=t2.a AND t2.b=t3.a and t1.b=t3.b;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 3 1 SIMPLE t1 ALL NULL NULL NULL NULL 3
1 SIMPLE t2 index PRIMARY PRIMARY 8 NULL 3 Using where; Using index 1 SIMPLE t2 ref PRIMARY PRIMARY 4 test.t1.a 1 Using index
1 SIMPLE t3 index PRIMARY PRIMARY 8 NULL 3 Using where; Using index 1 SIMPLE t3 eq_ref PRIMARY PRIMARY 8 test.t2.b,test.t1.b 1 Using index
delete t2.*,t3.* from t1,t2,t3 where t1.a=t2.a AND t2.b=t3.a and t1.b=t3.b; delete t2.*,t3.* from t1,t2,t3 where t1.a=t2.a AND t2.b=t3.a and t1.b=t3.b;
select * from t3; select * from t3;
a b a b
......
mysql-test/r/select.result
View file @ edfc33be
...@@ -3390,3 +3390,24 @@ id select_type table type possible_keys key key_len ref rows Extra ...@@ -3390,3 +3390,24 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 const PRIMARY PRIMARY 4 const 1 1 SIMPLE t2 const PRIMARY PRIMARY 4 const 1
1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 2 Using where 1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 2 Using where
DROP TABLE t1,t2; DROP TABLE t1,t2;
CREATE TABLE t1 (i TINYINT UNSIGNED NOT NULL);
INSERT t1 SET i = 0;
UPDATE t1 SET i = -1;
Warnings:
Warning 1264 Out of range value adjusted for column 'i' at row 1
SELECT * FROM t1;
i
0
UPDATE t1 SET i = CAST(i - 1 AS SIGNED);
Warnings:
Warning 1264 Out of range value adjusted for column 'i' at row 1
SELECT * FROM t1;
i
0
UPDATE t1 SET i = i - 1;
Warnings:
Warning 1264 Out of range value adjusted for column 'i' at row 1
SELECT * FROM t1;
i
255
DROP TABLE t1;
mysql-test/r/subselect.result
View file @ edfc33be
...@@ -1354,10 +1354,10 @@ a ...@@ -1354,10 +1354,10 @@ a
explain extended select * from t2 where t2.a in (select t1.a from t1,t3 where t1.b=t3.a); explain extended select * from t2 where t2.a in (select t1.a from t1,t3 where t1.b=t3.a);
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t2 index NULL a 5 NULL 4 Using where; Using index 1 PRIMARY t2 index NULL a 5 NULL 4 Using where; Using index
2 DEPENDENT SUBQUERY t3 index a a 5 NULL 3 Using index 2 DEPENDENT SUBQUERY t1 ref a a 5 func 1001 Using where; Using index
2 DEPENDENT SUBQUERY t1 ref a a 10 func,test.t3.a 1167 Using where; Using index 2 DEPENDENT SUBQUERY t3 index a a 5 NULL 3 Using where; Using index
Warnings: Warnings:
Note 1003 select `test`.`t2`.`a` AS `a` from `test`.`t2` where <in_optimizer>(`test`.`t2`.`a`,<exists>(select 1 AS `Not_used` from `test`.`t1` join `test`.`t3` where ((`test`.`t1`.`b` = `test`.`t3`.`a`) and (<cache>(`test`.`t2`.`a`) = `test`.`t1`.`a`)))) Note 1003 select `test`.`t2`.`a` AS `a` from `test`.`t2` where <in_optimizer>(`test`.`t2`.`a`,<exists>(select 1 AS `Not_used` from `test`.`t1` join `test`.`t3` where ((`test`.`t3`.`a` = `test`.`t1`.`b`) and (<cache>(`test`.`t2`.`a`) = `test`.`t1`.`a`))))
insert into t1 values (3,31); insert into t1 values (3,31);
select * from t2 where t2.a in (select a from t1 where t1.b <> 30); select * from t2 where t2.a in (select a from t1 where t1.b <> 30);
a a
......
mysql-test/t/select.test
View file @ edfc33be
...@@ -2871,3 +2871,18 @@ SELECT t2.sku, t2.sppr, t2.name, t1.sku, t1.pr ...@@ -2871,3 +2871,18 @@ SELECT t2.sku, t2.sppr, t2.name, t1.sku, t1.pr
DROP TABLE t1,t2; DROP TABLE t1,t2;
#
# Bug#18712: Truncation problem (needs just documenting and test
# cases to prevent fixing this accidently. It is intended behaviour)
#
CREATE TABLE t1 (i TINYINT UNSIGNED NOT NULL);
INSERT t1 SET i = 0;
UPDATE t1 SET i = -1;
SELECT * FROM t1;
UPDATE t1 SET i = CAST(i - 1 AS SIGNED);
SELECT * FROM t1;
UPDATE t1 SET i = i - 1;
SELECT * FROM t1;
DROP TABLE t1;
sql/mysql_priv.h
View file @ edfc33be
...@@ -1365,8 +1365,8 @@ bool mysql_manager_submit(void (*action)()); ...@@ -1365,8 +1365,8 @@ bool mysql_manager_submit(void (*action)());
void print_where(COND *cond,const char *info); void print_where(COND *cond,const char *info);
void print_cached_tables(void); void print_cached_tables(void);
void TEST_filesort(SORT_FIELD *sortorder,uint s_length); void TEST_filesort(SORT_FIELD *sortorder,uint s_length);
void print_plan(JOIN* join, double read_time, double record_count, void print_plan(JOIN* join,uint idx, double record_count, double read_time,
uint idx, const char *info); double current_read_time, const char *info);
#endif #endif
void mysql_print_status(); void mysql_print_status();
/* key.cc */ /* key.cc */
......
sql/sql_lex.cc
View file @ edfc33be
...@@ -196,6 +196,7 @@ void lex_start(THD *thd, const uchar *buf, uint length) ...@@ -196,6 +196,7 @@ void lex_start(THD *thd, const uchar *buf, uint length)
void lex_end(LEX *lex) void lex_end(LEX *lex)
{ {
DBUG_ENTER("lex_end"); DBUG_ENTER("lex_end");
DBUG_PRINT("enter", ("lex: 0x%lx", (long) lex));
if (lex->yacc_yyss) if (lex->yacc_yyss)
{ {
my_free(lex->yacc_yyss, MYF(0)); my_free(lex->yacc_yyss, MYF(0));
......
sql/sql_select.cc
View file @ edfc33be
...@@ -3361,32 +3361,45 @@ best_access_path(JOIN *join, ...@@ -3361,32 +3361,45 @@ best_access_path(JOIN *join,
{ {
key_part_map found_part= 0; key_part_map found_part= 0;
table_map found_ref= 0; table_map found_ref= 0;
uint found_ref_or_null= 0;
uint key= keyuse->key; uint key= keyuse->key;
KEY *keyinfo= table->key_info+key; KEY *keyinfo= table->key_info+key;
bool ft_key= (keyuse->keypart == FT_KEYPART); bool ft_key= (keyuse->keypart == FT_KEYPART);
uint found_ref_or_null= 0;
/* Calculate how many key segments of the current key we can use */ /* Calculate how many key segments of the current key we can use */
start_key= keyuse; start_key= keyuse;
do do
{ /* for each keypart */ { /* for each keypart */
uint keypart= keyuse->keypart; uint keypart= keyuse->keypart;
uint found_part_ref_or_null= KEY_OPTIMIZE_REF_OR_NULL; table_map best_part_found_ref= 0;
double best_prev_record_reads= DBL_MAX;
do do
{ {
if (!(remaining_tables & keyuse->used_tables) && if (!(remaining_tables & keyuse->used_tables) &&
!(found_ref_or_null & keyuse->optimize)) !(found_ref_or_null & keyuse->optimize))
{ {
found_part|= keyuse->keypart_map; found_part|= keyuse->keypart_map;
found_ref|= keyuse->used_tables; double tmp= prev_record_reads(join,
(found_ref |
keyuse->used_tables));
if (tmp < best_prev_record_reads)
{
best_part_found_ref= keyuse->used_tables;
best_prev_record_reads= tmp;
}
if (rec > keyuse->ref_table_rows) if (rec > keyuse->ref_table_rows)
rec= keyuse->ref_table_rows; rec= keyuse->ref_table_rows;
found_part_ref_or_null&= keyuse->optimize; /*
If there is one 'key_column IS NULL' expression, we can
use this ref_or_null optimisation of this field
*/
found_ref_or_null|= (keyuse->optimize &
KEY_OPTIMIZE_REF_OR_NULL);
} }
keyuse++; keyuse++;
found_ref_or_null|= found_part_ref_or_null;
} while (keyuse->table == table && keyuse->key == key && } while (keyuse->table == table && keyuse->key == key &&
keyuse->keypart == keypart); keyuse->keypart == keypart);
found_ref|= best_part_found_ref;
} while (keyuse->table == table && keyuse->key == key); } while (keyuse->table == table && keyuse->key == key);
/* /*
...@@ -3451,17 +3464,17 @@ best_access_path(JOIN *join, ...@@ -3451,17 +3464,17 @@ best_access_path(JOIN *join,
} }
} }
/* Limit the number of matched rows */ /* Limit the number of matched rows */
tmp = records; tmp= records;
set_if_smaller(tmp, (double) thd->variables.max_seeks_for_key); set_if_smaller(tmp, (double) thd->variables.max_seeks_for_key);
if (table->used_keys.is_set(key)) if (table->used_keys.is_set(key))
{ {
/* we can use only index tree */ /* we can use only index tree */
uint keys_per_block= table->file->block_size/2/ uint keys_per_block= table->file->block_size/2/
(keyinfo->key_length+table->file->ref_length)+1; (keyinfo->key_length+table->file->ref_length)+1;
tmp = record_count*(tmp+keys_per_block-1)/keys_per_block; tmp= record_count*(tmp+keys_per_block-1)/keys_per_block;
} }
else else
tmp = record_count*min(tmp,s->worst_seeks); tmp= record_count*min(tmp,s->worst_seeks);
} }
} }
else else
...@@ -3475,7 +3488,7 @@ best_access_path(JOIN *join, ...@@ -3475,7 +3488,7 @@ best_access_path(JOIN *join,
(!(table->file->index_flags(key, 0, 0) & HA_ONLY_WHOLE_INDEX) || (!(table->file->index_flags(key, 0, 0) & HA_ONLY_WHOLE_INDEX) ||
found_part == PREV_BITS(uint,keyinfo->key_parts))) found_part == PREV_BITS(uint,keyinfo->key_parts)))
{ {
max_key_part=max_part_bit(found_part); max_key_part= max_part_bit(found_part);
/* /*
Check if quick_range could determinate how many rows we Check if quick_range could determinate how many rows we
will match will match
...@@ -3486,8 +3499,8 @@ best_access_path(JOIN *join, ...@@ -3486,8 +3499,8 @@ best_access_path(JOIN *join,
else else
{ {
/* Check if we have statistic about the distribution */ /* Check if we have statistic about the distribution */
if ((records = keyinfo->rec_per_key[max_key_part-1])) if ((records= keyinfo->rec_per_key[max_key_part-1]))
tmp = records; tmp= records;
else else
{ {
/* /*
...@@ -3548,13 +3561,13 @@ best_access_path(JOIN *join, ...@@ -3548,13 +3561,13 @@ best_access_path(JOIN *join,
/* we can use only index tree */ /* we can use only index tree */
uint keys_per_block= table->file->block_size/2/ uint keys_per_block= table->file->block_size/2/
(keyinfo->key_length+table->file->ref_length)+1; (keyinfo->key_length+table->file->ref_length)+1;
tmp = record_count*(tmp+keys_per_block-1)/keys_per_block; tmp= record_count*(tmp+keys_per_block-1)/keys_per_block;
} }
else else
tmp = record_count*min(tmp,s->worst_seeks); tmp= record_count*min(tmp,s->worst_seeks);
} }
else else
tmp = best_time; // Do nothing tmp= best_time; // Do nothing
} }
} /* not ft_key */ } /* not ft_key */
if (tmp < best_time - records/(double) TIME_FOR_COMPARE) if (tmp < best_time - records/(double) TIME_FOR_COMPARE)
...@@ -3906,7 +3919,8 @@ optimize_straight_join(JOIN *join, table_map join_tables) ...@@ -3906,7 +3919,8 @@ optimize_straight_join(JOIN *join, table_map join_tables)
for (JOIN_TAB **pos= join->best_ref + idx ; (s= *pos) ; pos++) for (JOIN_TAB **pos= join->best_ref + idx ; (s= *pos) ; pos++)
{ {
/* Find the best access method from 's' to the current partial plan */ /* Find the best access method from 's' to the current partial plan */
best_access_path(join, s, join->thd, join_tables, idx, record_count, read_time); best_access_path(join, s, join->thd, join_tables, idx,
record_count, read_time);
/* compute the cost of the new plan extended with 's' */ /* compute the cost of the new plan extended with 's' */
record_count*= join->positions[idx].records_read; record_count*= join->positions[idx].records_read;
read_time+= join->positions[idx].read_time; read_time+= join->positions[idx].read_time;
...@@ -4029,8 +4043,9 @@ greedy_search(JOIN *join, ...@@ -4029,8 +4043,9 @@ greedy_search(JOIN *join,
'join->best_positions' contains a complete optimal extension of the 'join->best_positions' contains a complete optimal extension of the
current partial QEP. current partial QEP.
*/ */
DBUG_EXECUTE("opt", print_plan(join, read_time, record_count, DBUG_EXECUTE("opt", print_plan(join, join->tables,
join->tables, "optimal");); record_count, read_time, read_time,
"optimal"););
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -4061,8 +4076,9 @@ greedy_search(JOIN *join, ...@@ -4061,8 +4076,9 @@ greedy_search(JOIN *join,
--rem_size; --rem_size;
++idx; ++idx;
DBUG_EXECUTE("opt", DBUG_EXECUTE("opt", print_plan(join, join->tables,
print_plan(join, read_time, record_count, idx, "extended");); record_count, read_time, read_time,
"extended"););
} while (TRUE); } while (TRUE);
} }
...@@ -4085,13 +4101,14 @@ greedy_search(JOIN *join, ...@@ -4085,13 +4101,14 @@ greedy_search(JOIN *join,
read_time the cost of the best partial plan read_time the cost of the best partial plan
search_depth maximum depth of the recursion and thus size of the found search_depth maximum depth of the recursion and thus size of the found
optimal plan (0 < search_depth <= join->tables+1). optimal plan (0 < search_depth <= join->tables+1).
prune_level pruning heuristics that should be applied during optimization prune_level pruning heuristics that should be applied during
optimization
(values: 0 = EXHAUSTIVE, 1 = PRUNE_BY_TIME_OR_ROWS) (values: 0 = EXHAUSTIVE, 1 = PRUNE_BY_TIME_OR_ROWS)
DESCRIPTION DESCRIPTION
The procedure searches for the optimal ordering of the query tables in set The procedure searches for the optimal ordering of the query tables in set
'remaining_tables' of size N, and the corresponding optimal access paths to each 'remaining_tables' of size N, and the corresponding optimal access paths to
table. The choice of a table order and an access path for each table each table. The choice of a table order and an access path for each table
constitutes a query execution plan (QEP) that fully specifies how to constitutes a query execution plan (QEP) that fully specifies how to
execute the query. execute the query.
...@@ -4201,8 +4218,8 @@ best_extension_by_limited_search(JOIN *join, ...@@ -4201,8 +4218,8 @@ best_extension_by_limited_search(JOIN *join,
double best_record_count= DBL_MAX; double best_record_count= DBL_MAX;
double best_read_time= DBL_MAX; double best_read_time= DBL_MAX;
DBUG_EXECUTE("opt", DBUG_EXECUTE("opt", print_plan(join, idx, record_count, read_time, read_time,
print_plan(join, read_time, record_count, idx, "part_plan");); "part_plan"););
for (JOIN_TAB **pos= join->best_ref + idx ; (s= *pos) ; pos++) for (JOIN_TAB **pos= join->best_ref + idx ; (s= *pos) ; pos++)
{ {
...@@ -4214,7 +4231,8 @@ best_extension_by_limited_search(JOIN *join, ...@@ -4214,7 +4231,8 @@ best_extension_by_limited_search(JOIN *join,
double current_record_count, current_read_time; double current_record_count, current_read_time;
/* Find the best access method from 's' to the current partial plan */ /* Find the best access method from 's' to the current partial plan */
best_access_path(join, s, thd, remaining_tables, idx, record_count, read_time); best_access_path(join, s, thd, remaining_tables, idx,
record_count, read_time);
/* Compute the cost of extending the plan with 's' */ /* Compute the cost of extending the plan with 's' */
current_record_count= record_count * join->positions[idx].records_read; current_record_count= record_count * join->positions[idx].records_read;
current_read_time= read_time + join->positions[idx].read_time; current_read_time= read_time + join->positions[idx].read_time;
...@@ -4223,7 +4241,12 @@ best_extension_by_limited_search(JOIN *join, ...@@ -4223,7 +4241,12 @@ best_extension_by_limited_search(JOIN *join,
if ((current_read_time + if ((current_read_time +
current_record_count / (double) TIME_FOR_COMPARE) >= join->best_read) current_record_count / (double) TIME_FOR_COMPARE) >= join->best_read)
{ {
DBUG_EXECUTE("opt", print_plan(join, read_time, record_count, idx, DBUG_EXECUTE("opt", print_plan(join, idx+1,
current_record_count,
read_time,
(current_read_time +
current_record_count /
(double) TIME_FOR_COMPARE),
"prune_by_cost");); "prune_by_cost"););
restore_prev_nj_state(s); restore_prev_nj_state(s);
continue; continue;
...@@ -4252,7 +4275,10 @@ best_extension_by_limited_search(JOIN *join, ...@@ -4252,7 +4275,10 @@ best_extension_by_limited_search(JOIN *join,
} }
else else
{ {
DBUG_EXECUTE("opt", print_plan(join, read_time, record_count, idx, DBUG_EXECUTE("opt", print_plan(join, idx+1,
current_record_count,
read_time,
current_read_time,
"pruned_by_heuristic");); "pruned_by_heuristic"););
restore_prev_nj_state(s); restore_prev_nj_state(s);
continue; continue;
...@@ -4280,7 +4306,8 @@ best_extension_by_limited_search(JOIN *join, ...@@ -4280,7 +4306,8 @@ best_extension_by_limited_search(JOIN *join,
*/ */
current_read_time+= current_record_count / (double) TIME_FOR_COMPARE; current_read_time+= current_record_count / (double) TIME_FOR_COMPARE;
if (join->sort_by_table && if (join->sort_by_table &&
join->sort_by_table != join->positions[join->const_tables].table->table) join->sort_by_table !=
join->positions[join->const_tables].table->table)
/* We have to make a temp table */ /* We have to make a temp table */
current_read_time+= current_record_count; current_read_time+= current_record_count;
if ((search_depth == 1) || (current_read_time < join->best_read)) if ((search_depth == 1) || (current_read_time < join->best_read))
...@@ -4289,8 +4316,10 @@ best_extension_by_limited_search(JOIN *join, ...@@ -4289,8 +4316,10 @@ best_extension_by_limited_search(JOIN *join,
sizeof(POSITION) * (idx + 1)); sizeof(POSITION) * (idx + 1));
join->best_read= current_read_time - 0.001; join->best_read= current_read_time - 0.001;
} }
DBUG_EXECUTE("opt", print_plan(join, current_read_time, DBUG_EXECUTE("opt", print_plan(join, idx+1,
current_record_count, idx, current_record_count,
read_time,
current_read_time,
"full_plan");); "full_plan"););
} }
restore_prev_nj_state(s); restore_prev_nj_state(s);
...@@ -4311,7 +4340,6 @@ find_best(JOIN *join,table_map rest_tables,uint idx,double record_count, ...@@ -4311,7 +4340,6 @@ find_best(JOIN *join,table_map rest_tables,uint idx,double record_count,
ha_rows rec; ha_rows rec;
double tmp; double tmp;
THD *thd= join->thd; THD *thd= join->thd;
if (!rest_tables) if (!rest_tables)
{ {
DBUG_PRINT("best",("read_time: %g record_count: %g",read_time, DBUG_PRINT("best",("read_time: %g record_count: %g",read_time,
......
sql/sql_test.cc
View file @ edfc33be
...@@ -230,8 +230,8 @@ TEST_join(JOIN *join) ...@@ -230,8 +230,8 @@ TEST_join(JOIN *join)
*/ */
void void
print_plan(JOIN* join, double read_time, double record_count, print_plan(JOIN* join, uint idx, double record_count, double read_time,
uint idx, const char *info) double current_read_time, const char *info)
{ {
uint i; uint i;
POSITION pos; POSITION pos;
...@@ -245,13 +245,15 @@ print_plan(JOIN* join, double read_time, double record_count, ...@@ -245,13 +245,15 @@ print_plan(JOIN* join, double read_time, double record_count,
DBUG_LOCK_FILE; DBUG_LOCK_FILE;
if (join->best_read == DBL_MAX) if (join->best_read == DBL_MAX)
{ {
fprintf(DBUG_FILE,"%s; idx:%u, best: DBL_MAX, current:%g\n", fprintf(DBUG_FILE,
info, idx, read_time); "%s; idx:%u, best: DBL_MAX, atime: %g, itime: %g, count: %g\n",
info, idx, current_read_time, read_time, record_count);
} }
else else
{ {
fprintf(DBUG_FILE,"%s; idx: %u, best: %g, current: %g\n", fprintf(DBUG_FILE,
info, idx, join->best_read, read_time); "%s; idx:%u, best: %g, accumulated: %g, increment: %g, count: %g\n",
info, idx, join->best_read, current_read_time, read_time, record_count);
} }
/* Print the tables in JOIN->positions */ /* Print the tables in JOIN->positions */
...@@ -270,9 +272,9 @@ print_plan(JOIN* join, double read_time, double record_count, ...@@ -270,9 +272,9 @@ print_plan(JOIN* join, double read_time, double record_count,
Print the tables in JOIN->best_positions only if at least one complete plan Print the tables in JOIN->best_positions only if at least one complete plan
has been found. An indicator for this is the value of 'join->best_read'. has been found. An indicator for this is the value of 'join->best_read'.
*/ */
fputs("BEST_POSITIONS: ", DBUG_FILE);
if (join->best_read < DBL_MAX) if (join->best_read < DBL_MAX)
{ {
fputs("BEST_POSITIONS: ", DBUG_FILE);
for (i= 0; i < idx ; i++) for (i= 0; i < idx ; i++)
{ {
pos= join->best_positions[i]; pos= join->best_positions[i];
......
sql/sql_view.cc
View file @ edfc33be
...@@ -943,7 +943,6 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table) ...@@ -943,7 +943,6 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table)
goto err; goto err;
} }
if (!(table->view_tables= if (!(table->view_tables=
(List<TABLE_LIST>*) new(thd->mem_root) List<TABLE_LIST>)) (List<TABLE_LIST>*) new(thd->mem_root) List<TABLE_LIST>))
goto err; goto err;
...@@ -1194,6 +1193,7 @@ ok2: ...@@ -1194,6 +1193,7 @@ ok2:
old_lex->time_zone_tables_used= thd->lex->time_zone_tables_used; old_lex->time_zone_tables_used= thd->lex->time_zone_tables_used;
result= !table->prelocking_placeholder && table->prepare_security(thd); result= !table->prelocking_placeholder && table->prepare_security(thd);
lex_end(thd->lex);
end: end:
if (arena) if (arena)
thd->restore_active_arena(arena, &backup); thd->restore_active_arena(arena, &backup);
...@@ -1202,6 +1202,8 @@ end: ...@@ -1202,6 +1202,8 @@ end:
DBUG_RETURN(result); DBUG_RETURN(result);
err: err:
DBUG_ASSERT(thd->lex == table->view);
lex_end(thd->lex);
delete table->view; delete table->view;
table->view= 0; // now it is not VIEW placeholder table->view= 0; // now it is not VIEW placeholder
result= 1; result= 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7