Develop merge

Develop merge
This commit is contained in:
MassimilianoPinto
2015-09-18 11:15:48 +02:00

View File

@ -2641,7 +2641,6 @@ uint8_t *ptr;
return slave->dcb->func.write(slave->dcb, pkt); return slave->dcb->func.write(slave->dcb, pkt);
} }
/** /**
* Stop current replication from master * Stop current replication from master
* *
@ -3531,7 +3530,6 @@ blr_set_master_password(ROUTER_INSTANCE *router, char *password) {
return 0; return 0;
} }
/** /**
* Parse a CHANGE MASTER TO SQL command * Parse a CHANGE MASTER TO SQL command
* *
@ -4105,7 +4103,6 @@ char *sep = " ,=";
return -1; return -1;
} }
/** /**
* Send the response to the SQL command "SHOW [GLOBAL] STATUS LIKE 'xxx' * Send the response to the SQL command "SHOW [GLOBAL] STATUS LIKE 'xxx'
* *