1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

after merge fix

Browse Source 
mysql-test/r/ndb_read_multi_range.result:
  result fix
mysql-test/t/ndb_read_multi_range.test:
  test case fix
This commit is contained in:
unknown 2007-02-02 14:26:53 +04:00
parent ed0e4a968a
commit c01bbd33d7
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/ndb_read_multi_range.result
View File

@ -417,12 +417,12 @@ a b c
9199 9200 NULL 9199 9200 NULL
223456 223457 NULL 223456 223457 NULL
245651 245652 2005-12-08 15:58:27 245651 245652 2005-12-08 15:58:27
select c, count(*) select t21.c, count(*)
from t21 from t21
inner join t22 using (a) inner join t22 using (a)
where t22.b in (2,256,257,1121,1134,4102,9200,223457,245652) where t22.b in (2,256,257,1121,1134,4102,9200,223457,245652)
group by c group by t21.c
order by c; order by t21.c;
c count(*) c count(*)
NULL 7 NULL 7
2005-12-08 15:58:27 1 2005-12-08 15:58:27 1

6
mysql-test/t/ndb_read_multi_range.test
View File

@ -249,12 +249,12 @@ t22.a in (select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a a
delete from t22 where a > 245651; delete from t22 where a > 245651;
update t22 set b = a + 1; update t22 set b = a + 1;
select * from t22 order by 1,2,3; select * from t22 order by 1,2,3;
select c, count(*) select t21.c, count(*)
from t21 from t21
inner join t22 using (a) inner join t22 using (a)
where t22.b in (2,256,257,1121,1134,4102,9200,223457,245652) where t22.b in (2,256,257,1121,1134,4102,9200,223457,245652)
group by c group by t21.c
order by c; order by t21.c;
DROP TABLE t1, t11, t12, t21, t22; DROP TABLE t1, t11, t12, t21, t22;

2
sql/opt_range.cc
View File

@ -563,7 +563,7 @@ public:
/* Number of ranges in the last checked tree->key */ /* Number of ranges in the last checked tree->key */
uint n_ranges; uint n_ranges;
uint8 first_null_comp; /* first null component if any, 0 - otherwise */ uint8 first_null_comp; /* first null component if any, 0 - otherwise */
} PARAM; };
class TABLE_READ_PLAN; class TABLE_READ_PLAN;
class TRP_RANGE; class TRP_RANGE;

4
sql/sql_delete.cc
View File

@ -75,8 +75,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
if (!using_limit && const_cond && (!conds || conds->val_int()) && if (!using_limit && const_cond && (!conds || conds->val_int()) &&
!(specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) && !(specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) &&
(thd->lex->sql_command == SQLCOM_TRUNCATE || (thd->lex->sql_command == SQLCOM_TRUNCATE ||
!(table->triggers && table->triggers->has_delete_triggers())) !(table->triggers && table->triggers->has_delete_triggers())) &&
) !thd->current_stmt_binlog_row_based)
{ {
/* Update the table->file->stats.records number */ /* Update the table->file->stats.records number */
table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK); table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);