database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix after merge of 5.0 into 5.1. Failed tests before merge: bdb-deadlock, ndb_cache2, ndb_multi2,

Browse Source 
ps_6bdb (this one fails circa once over 4 runs). After the merge: the same PLUS mysql_client_test&sp (due to problem in fix of BUG#14845 which has also
been noticed in 5.0 too and Konstantin is looking at it) PLUS mysqlcheck (just consequence of mysql_client_test).
And a replication bugfix (thd->spcont must be taken into account when calling tables_ok(), as in 5.0,
and so some brackets were missing which changed one test).
Pekka will look at the NDB code where I just used "ul": ndb_charset test, and storage/ndb/src/kernel/vm/SimulatedBlock.cpp
and storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp (SimulatedBlock.hpp automerged);
please also check storage/ndb/src/ndbapi/NdbRecAttr.cpp. Petr please check ha_tina.cc.


mysql-test/r/ndb_charset.result:
  "ul" in merge (Pekka please fix)
mysql-test/t/ndb_charset.test:
  "ul" in merge (Pekka please fix)
sql/sql_acl.cc:
  missing ()
sql/sql_parse.cc:
  If thd->spcont is true, always replicate (as in 5.0) (bad old merge probably).
This commit is contained in:
unknown
2005-11-19 15:56:55 +01:00
parent 51972f1aea
commit a93a2a90e6
4 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/r/ndb_charset.result
View File

@ -306,21 +306,11 @@ count(*)
drop table t1;
create table t1 (
a char(10) primary key
) engine=ndbcluster default charset=latin1;
insert into t1 values ('aaabb');
) engine=ndb;
insert into t1 values ('jonas % ');
replace into t1 values ('jonas % ');
replace into t1 values ('jonas % ');
select * from t1;
a
aaabb
replace into t1 set a = 'AAABB';
select * from t1;
a
AAABB
replace into t1 set a = 'aAaBb';
select * from t1;
a
aAaBb
replace into t1 set a = 'aaabb';
select * from t1;
a
aaabb
jonas %
drop table t1;

15
mysql-test/t/ndb_charset.test
View File

@ -237,18 +237,13 @@ drop table t1;
#select a,b,length(a),length(b) from t1 where a='c' and b='c';
#drop table t1;
# bug#14007
# bug
create table t1 (
a char(10) primary key
) engine=ndbcluster default charset=latin1;
insert into t1 values ('aaabb');
select * from t1;
replace into t1 set a = 'AAABB';
select * from t1;
replace into t1 set a = 'aAaBb';
select * from t1;
replace into t1 set a = 'aaabb';
) engine=ndb;
insert into t1 values ('jonas % ');
replace into t1 values ('jonas % ');
replace into t1 values ('jonas % ');
select * from t1;
drop table t1;

2
sql/sql_acl.cc
View File

@ -1427,7 +1427,7 @@ bool change_password(THD *thd, const char *host, const char *user,
*/
tables.updating= 1;
/* Thanks to bzero, tables.next==0 */
if (!thd->spcont || rpl_filter->tables_ok(0, &tables))
if (!(thd->spcont || rpl_filter->tables_ok(0, &tables)))
DBUG_RETURN(0);
}
#endif

2
sql/sql_parse.cc
View File

@ -182,7 +182,7 @@ static bool begin_trans(THD *thd)
*/
inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables)
{
return rpl_filter->is_on() && tables &&
return rpl_filter->is_on() && tables && !thd->spcont &&
!rpl_filter->tables_ok(thd->db, tables);
}
#endif