mirror of
https://github.com/MariaDB/server.git
synced 2025-09-06 19:08:06 +03:00
WL# 3031
Post-commit issues fixed * Test results for other tests fixed due to added error #s * Memory allocation/free issues found with running with valgrind * Fix to mysql-test-run shell script to run federated_server test (installs mysql.servers table properly)
This commit is contained in:
@@ -30,6 +30,7 @@ windows=$4
|
||||
|
||||
# Initialize variables
|
||||
c_d="" i_d=""
|
||||
c_s="" i_s=""
|
||||
c_h="" i_h=""
|
||||
c_u="" i_u=""
|
||||
c_f="" i_f=""
|
||||
@@ -199,21 +200,21 @@ then
|
||||
echo "Preparing servers table" 1>&2;
|
||||
fi
|
||||
|
||||
c_d="$c_d
|
||||
|
||||
c_s="
|
||||
CREATE TABLE servers ("
|
||||
c_d="$c_d Server_name char(64) NOT NULL,"
|
||||
c_d="$c_d Hostname char(64) NOT NULL,"
|
||||
c_d="$c_d Db char(64) NOT NULL,"
|
||||
c_d="$c_d Username char(64) NOT NULL,"
|
||||
c_d="$c_d Passwd char(64) NOT NULL,"
|
||||
c_d="$c_d Portnum INT(4),"
|
||||
c_d="$c_d Sock char(64),"
|
||||
c_d="$c_d Scheme char(64) NOT NULL,"
|
||||
c_d="$c_d Owner char(64) NOT NULL,"
|
||||
c_d="$c_d PRIMARY KEY (Server_name));"
|
||||
c_s="$c_s Server_name char(64) NOT NULL,"
|
||||
c_s="$c_s Host char(64) NOT NULL,"
|
||||
c_s="$c_s Db char(64) NOT NULL,"
|
||||
c_s="$c_s Username char(64) NOT NULL,"
|
||||
c_s="$c_s Password char(64) NOT NULL,"
|
||||
c_s="$c_s Port INT(4),"
|
||||
c_s="$c_s Socket char(64),"
|
||||
c_s="$c_s Wrapper char(64) NOT NULL,"
|
||||
c_s="$c_s Owner char(64) NOT NULL,"
|
||||
c_s="$c_s PRIMARY KEY (Server_name))"
|
||||
c_s="$c_s comment='MySQL Foreign Servers table';"
|
||||
|
||||
i_d="INSERT INTO servers VALUES
|
||||
i_s="INSERT INTO servers VALUES
|
||||
('test','localhost','test','root','', 0,
|
||||
'','mysql','root');
|
||||
"
|
||||
@@ -876,6 +877,9 @@ $i_f
|
||||
$c_pl
|
||||
$i_pl
|
||||
|
||||
$c_s
|
||||
$i_s
|
||||
|
||||
$c_t
|
||||
$c_c
|
||||
|
||||
|
Reference in New Issue
Block a user