List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:January 23 2012 9:40am
Subject:bzr push into mysql-trunk branch (vasil.dimov:3763 to 3765)
View as plain text  
 3765 Vasil Dimov	2012-01-23
      Non-functional change: remove outdated comment.
      
      This comment should have been removed by
      svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/innodb%2B:5998:
      
         /* In the Windows plugin, the return value of current_thd is
         undefined.  Map it to NULL. */
        -#if defined MYSQL_DYNAMIC_PLUGIN && defined __WIN__
        -# undef current_thd
        -# define current_thd NULL
        -# define EQ_CURRENT_THD(thd) TRUE
        -#else /* MYSQL_DYNAMIC_PLUGIN && __WIN__ */
        -# define EQ_CURRENT_THD(thd) ((thd) == current_thd)
        -#endif /* MYSQL_DYNAMIC_PLUGIN && __WIN__ */
        +
        +#define EQ_CURRENT_THD(thd) ((thd) == current_thd)
        +

    modified:
      storage/innobase/handler/ha_innodb.cc
 3764 Vasil Dimov	2012-01-20
      Non-functional change: extend error messages so they can be more useful
      if they ever get printed.

    modified:
      storage/innobase/dict/dict0load.cc
 3763 Andrei Elkin	2012-01-22
      merging the final part of post-fixes from 5.5 bug13593869-64035 branch.

    modified:
      mysql-test/suite/rpl/r/rpl_log_pos.result
      mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result
      sql/rpl_master.cc
=== modified file 'storage/innobase/dict/dict0load.cc'
--- a/storage/innobase/dict/dict0load.cc	revid:andrei.elkin@stripped
+++ b/storage/innobase/dict/dict0load.cc	revid:vasil.dimov@stripped
@@ -2240,8 +2240,9 @@ dict_load_foreign(
 		/* Not found */
 
 		fprintf(stderr,
-			"InnoDB: Error A: cannot load foreign constraint "
-			"%.*s\n", (int) id_len, id);
+			"InnoDB: Error: cannot load foreign constraint "
+			"%.*s: could not find the relevant record in "
+			"SYS_FOREIGN\n", (int) id_len, id);
 
 		btr_pcur_close(&pcur);
 		mtr_commit(&mtr);
@@ -2256,8 +2257,9 @@ dict_load_foreign(
 	if (len != id_len || ut_memcmp(id, field, len) != 0) {
 
 		fprintf(stderr,
-			"InnoDB: Error B: cannot load foreign constraint "
-			"%.*s\n", (int) id_len, id);
+			"InnoDB: Error: cannot load foreign constraint "
+			"%.*s: found %.*s instead in SYS_FOREIGN\n",
+			(int) id_len, id, (int) len, field);
 
 		btr_pcur_close(&pcur);
 		mtr_commit(&mtr);

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:andrei.elkin@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:vasil.dimov@stripped
@@ -99,12 +99,8 @@ static bool innodb_inited = 0;
 
 #define INSIDE_HA_INNOBASE_CC
 
-/* In the Windows plugin, the return value of current_thd is
-undefined.  Map it to NULL. */
-
 #define EQ_CURRENT_THD(thd) ((thd) == current_thd)
 
-
 static struct handlerton* innodb_hton_ptr;
 
 static const long AUTOINC_OLD_STYLE_LOCKING = 0;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (vasil.dimov:3763 to 3765) vasil.dimov23 Jan