Mercurial > emacs

changeset 109407:51e15604baa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 15 Jun 2010 08:18:19 +0000
parents f9f0aa88b6f8 (current diff) b2a9d4e48488 (diff)
children 4eded71f4215
files
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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)))