#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped
3897 Magnus Blåudd 2010-10-22
ndb
- move extern declaration of active_mi to before first use
modified:
sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc 2010-10-22 14:13:23 +0000
+++ b/sql/ha_ndbcluster.cc 2010-10-22 14:25:43 +0000
@@ -466,6 +466,7 @@ static int ndb_to_mysql_error(const NdbE
}
#ifdef HAVE_NDB_BINLOG
+extern Master_info *active_mi;
/* Write conflicting row to exceptions table. */
static int write_conflict_row(NDB_SHARE *share,
NdbTransaction *trans,
@@ -6107,7 +6108,6 @@ THR_LOCK_DATA **ha_ndbcluster::store_loc
*/
#ifdef HAVE_NDB_BINLOG
-extern Master_info *active_mi;
static int ndbcluster_update_apply_status(THD *thd, int do_update)
{
Thd_ndb *thd_ndb= get_thd_ndb(thd);
Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20101022142543-99qtvdcnr3smt1w6.bundle
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3897) | Magnus Blåudd | 22 Oct |