summaryrefslogtreecommitdiff
path: root/storage/federated
diff options
context:
space:
mode:
authorunknown <istruewing@stella.local>2008-03-26 10:56:03 +0100
committerunknown <istruewing@stella.local>2008-03-26 10:56:03 +0100
commitcebc10e3c08a832ab9fffc26e4ef8633630dd082 (patch)
tree9e5ba5e508b636add1b3ab6b1fb7ca5124f9db4d /storage/federated
parentf77bca6940d094143ee5b57f651ca47286453531 (diff)
parent3e28618f38a3a22f4e36075cf31b8b243ad7777e (diff)
downloadmariadb-git-cebc10e3c08a832ab9fffc26e4ef8633630dd082.tar.gz
Merge stella.local:/home2/mydev/mysql-5.1-ateam
into stella.local:/home2/mydev/mysql-5.1-axmrg mysql-test/r/federated.result: Auto merged mysql-test/t/federated.test: Auto merged sql/sql_delete.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_update.cc: Auto merged storage/federated/ha_federated.cc: Auto merged mysql-test/suite/binlog/r/binlog_unsafe.result: Manual merge mysql-test/suite/binlog/t/binlog_unsafe.test: Manual merge
Diffstat (limited to 'storage/federated')
-rw-r--r--storage/federated/ha_federated.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index ec99b47ce65..ed9a7a9cf8f 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -847,7 +847,6 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table,
if (!share->port)
{
if (!share->hostname || strcmp(share->hostname, my_localhost) == 0)
- share->socket= (char*) MYSQL_UNIX_ADDR;
else
share->port= MYSQL_PORT;
}