mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Manual merge
This commit is contained in:
@ -69,7 +69,7 @@ while ($_diff_i) {
|
|||||||
# and connect the appropriate server.
|
# and connect the appropriate server.
|
||||||
let $_pos= `SELECT LOCATE(':', '$_diff_table')`;
|
let $_pos= `SELECT LOCATE(':', '$_diff_table')`;
|
||||||
let $_diff_conn=`SELECT SUBSTR('$_diff_table', 1, $_pos-1)`;
|
let $_diff_conn=`SELECT SUBSTR('$_diff_table', 1, $_pos-1)`;
|
||||||
if (`SELECT "XX$_diff_conn" <> "XX"`) {
|
if (`SELECT 'XX$_diff_conn' <> 'XX'`) {
|
||||||
let $_diff_table=`SELECT SUBSTR('$_diff_table', $_pos+1)`;
|
let $_diff_table=`SELECT SUBSTR('$_diff_table', $_pos+1)`;
|
||||||
connection $_diff_conn;
|
connection $_diff_conn;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user