bk commit into 5.1 tree (guilhem:1.1965) BUG#14845

[guilhem]

Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1965 05/11/19 15:56:55 guilhem@stripped +4 -0
  Fix after merge of 5.0 into 5.1. Failed tests before merge: bdb-deadlock, ndb_cache2,
ndb_multi2,
  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.

  sql/sql_parse.cc
    1.484 05/11/19 15:56:50 guilhem@stripped +1 -1
    If thd->spcont is true, always replicate (as in 5.0) (bad old merge probably).

  sql/sql_acl.cc
    1.160 05/11/19 15:56:50 guilhem@stripped +1 -1
    missing ()

  mysql-test/t/ndb_charset.test
    1.10 05/11/19 15:56:50 guilhem@stripped +5 -10
    "ul" in merge (Pekka please fix)

  mysql-test/r/ndb_charset.result
    1.8 05/11/19 15:56:50 guilhem@stripped +5 -15
    "ul" in merge (Pekka please fix)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.1-merge-of-5.0

--- 1.159/sql/sql_acl.cc	2005-11-18 16:06:33 +01:00
+++ 1.160/sql/sql_acl.cc	2005-11-19 15:56:50 +01:00
@@ -1427,7 +1427,7 @@
     */
     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

--- 1.483/sql/sql_parse.cc	2005-11-19 10:41:38 +01:00
+++ 1.484/sql/sql_parse.cc	2005-11-19 15:56:50 +01:00
@@ -182,7 +182,7 @@
 */
 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

--- 1.7/mysql-test/r/ndb_charset.result	2005-11-19 10:41:37 +01:00
+++ 1.8/mysql-test/r/ndb_charset.result	2005-11-19 15:56:50 +01:00
@@ -306,21 +306,11 @@
 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;

--- 1.9/mysql-test/t/ndb_charset.test	2005-11-16 13:24:59 +01:00
+++ 1.10/mysql-test/t/ndb_charset.test	2005-11-19 15:56:50 +01:00
@@ -237,18 +237,13 @@
 #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;