bk commit into 5.1 tree (tomas:1.2652)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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@stripped, 2007-10-15 10:19:45+02:00, tomas@stripped +3 -0
  WL#4080
  - check for lower case table names, test failure on mac-os

  sql/ha_ndbcluster.cc@stripped, 2007-10-15 10:19:42+02:00, tomas@stripped +2 -2
    WL#4080
    - check for lower case table names, test failure on mac-os

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-10-15 10:19:43+02:00, tomas@stripped +4 -2
    WL#4080
    - check for lower case table names, test failure on mac-os

  sql/ha_ndbcluster_binlog.h@stripped, 2007-10-15 10:19:43+02:00, tomas@stripped +1 -0
    WL#4080
    - check for lower case table names, test failure on mac-os

diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2007-10-14 17:30:47 +02:00
+++ b/sql/ha_ndbcluster.cc	2007-10-15 10:19:42 +02:00
@@ -393,8 +393,8 @@ check_completed_operations_pre_commit(Th
             if (h->write_conflict_row(trans, row, ex_err))
             {
               char msg[FN_REFLEN];
-              my_snprintf(msg, sizeof(msg), "table %s%s NDB error %d '%s'",
-                          share->table_name, NDB_EXCEPTIONS_TABLE_SUFFIX,
+              my_snprintf(msg, sizeof(msg), "table %s NDB error %d '%s'",
+                          cfn_share->m_ex_tab->getName(),
                           ex_err.code, ex_err.message);
 
               NdbDictionary::Dictionary* dict= thd_ndb->ndb->getDictionary();
diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc	2007-10-14 12:32:29 +02:00
+++ b/sql/ha_ndbcluster_binlog.cc	2007-10-15 10:19:43 +02:00
@@ -2765,8 +2765,9 @@ slave_set_resolve_max(NDB_SHARE *share, 
   {
     /* get exceptions table */
     char ex_tab_name[FN_REFLEN];
-    strxnmov(ex_tab_name, sizeof(ex_tab_name),
-             share->table_name, NDB_EXCEPTIONS_TABLE_SUFFIX, NullS);
+    strxnmov(ex_tab_name, sizeof(ex_tab_name), share->table_name,
+             lower_case_table_names ? NDB_EXCEPTIONS_TABLE_SUFFIX_LOWER :
+             NDB_EXCEPTIONS_TABLE_SUFFIX, NullS);
     ndb->setDatabaseName(share->db);
     Ndb_table_guard ndbtab_g(dict, ex_tab_name);
     const NDBTAB *ex_tab= ndbtab_g.get_table();
@@ -3683,6 +3684,7 @@ ndbcluster_create_event_ops(THD *thd, ND
            !ndb_binlog_running ||
            (len >= sizeof(NDB_EXCEPTIONS_TABLE_SUFFIX) &&
             strcmp(share->table_name+len-sizeof(NDB_EXCEPTIONS_TABLE_SUFFIX)+1,
+                   lower_case_table_names ? NDB_EXCEPTIONS_TABLE_SUFFIX_LOWER :
                    NDB_EXCEPTIONS_TABLE_SUFFIX) == 0))
   {
     share->flags|= NSF_NO_BINLOG;
diff -Nrup a/sql/ha_ndbcluster_binlog.h b/sql/ha_ndbcluster_binlog.h
--- a/sql/ha_ndbcluster_binlog.h	2007-10-08 21:54:54 +02:00
+++ b/sql/ha_ndbcluster_binlog.h	2007-10-15 10:19:43 +02:00
@@ -98,6 +98,7 @@ static const char share_prefix[]= "./";
 
 #ifdef HAVE_NDB_BINLOG
 #define NDB_EXCEPTIONS_TABLE_SUFFIX "$EX"
+#define NDB_EXCEPTIONS_TABLE_SUFFIX_LOWER "$ex"
 
 const uint error_conflict_fn_old_violation= 9998;
 const uint error_conflict_fn_max_violation= 9999;