# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1276589899 0
# Node ID 51e15604baa1cfc1d196f3b8f379820f4fd61d3f
# Parent  f9f0aa88b6f8a53321f233bfb0a9146074fdfb8f# Parent  b2a9d4e484888fc4b4540a49a932095113cefb81
Merge from mainline.

diff -r f9f0aa88b6f8 -r 51e15604baa1 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jun 14 22:48:13 2010 +0000
+++ b/lisp/ChangeLog	Tue Jun 15 08:18:19 2010 +0000
@@ -1,3 +1,7 @@
+2010-06-15  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>  (tiny change)
+
+	* progmodes/sql.el (sql-connect-mysql): Fix typo.
+
 2010-06-14  Juri Linkov  <juri@jurta.org>
 
 	Add sort option `list-colors-sort'.  (Bug#6332)
diff -r f9f0aa88b6f8 -r 51e15604baa1 lisp/progmodes/sql.el
--- a/lisp/progmodes/sql.el	Mon Jun 14 22:48:13 2010 +0000
+++ b/lisp/progmodes/sql.el	Tue Jun 15 08:18:19 2010 +0000
@@ -3119,7 +3119,7 @@
 	(setq params (append (list sql-database) params)))
     (if (not (string= "" sql-server))
 	(setq params (append (list (concat "--host=" sql-server)) params)))
-    (if (not (and sql-port (numberp sql-port)))
+    (if (and sql-port (numberp sql-port))
 	(setq params (append (list (concat "--port=" (number-to-string sql-port))) params)))
     (if (not (string= "" sql-password))
 	(setq params (append (list (concat "--password=" sql-password)) params)))