[Python-modules-commits] r4654 - in packages/python-mysqldb (4 files)

[mtaylor-guest at users.alioth.debian.org]

    Date: Wednesday, February 27, 2008 @ 21:12:15
  Author: mtaylor-guest
Revision: 4654

* Added patch to allow setting the port in my.cnf or ~/.my.cnf to actually
  work.  

Added:
  packages/python-mysqldb/trunk/debian/patches/06_mysql_connect_port.dpatch
Modified:
  packages/python-mysqldb/trunk/	(properties)
  packages/python-mysqldb/trunk/debian/changelog
  packages/python-mysqldb/trunk/debian/patches/00list


Property changes on: packages/python-mysqldb/trunk
___________________________________________________________________
Name: bzr:revision-info
   + timestamp: 2008-02-27 12:59:31.137000084 -0800
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

Name: bzr:file-ids
   + debian/patches/06_mysql_connect_port.dpatch	06_mysql_connect_por-20080227205716-ow3rkfv9kv17gap1-1

Name: bzr:revision-id:v3-trunk2
   + 53 monty at inaugust.com-20080227205931-otl2jgkh4drxsn10


Modified: packages/python-mysqldb/trunk/debian/changelog
===================================================================
--- packages/python-mysqldb/trunk/debian/changelog	2008-02-27 19:14:36 UTC (rev 4653)
+++ packages/python-mysqldb/trunk/debian/changelog	2008-02-27 21:12:15 UTC (rev 4654)
@@ -1,10 +1,15 @@
 python-mysqldb (1.2.2-6) UNRELEASED; urgency=low
 
+  [ Sandro Tosi ]
   * debian/control
     - uniforming Vcs-Browser field
 
- -- Sandro Tosi <matrixhasu at gmail.com>  Thu, 03 Jan 2008 12:07:38 +0100
+  [ Monty Taylor ]
+  * Added patch to allow setting the port in my.cnf or ~/.my.cnf to actually
+    work.  
 
+ -- Monty Taylor <monty at inaugust.com>  Wed, 27 Feb 2008 12:58:32 -0800
+
 python-mysqldb (1.2.2-5) unstable; urgency=low
 
   [ Piotr Ożarowski ]

Modified: packages/python-mysqldb/trunk/debian/patches/00list
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/00list	2008-02-27 19:14:36 UTC (rev 4653)
+++ packages/python-mysqldb/trunk/debian/patches/00list	2008-02-27 21:12:15 UTC (rev 4654)
@@ -3,3 +3,4 @@
 03_converters_set2str
 04_disable_ez_setup
 05_null-connection-guard
+06_mysql_connect_port

Added: packages/python-mysqldb/trunk/debian/patches/06_mysql_connect_port.dpatch
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/06_mysql_connect_port.dpatch	                        (rev 0)
+++ packages/python-mysqldb/trunk/debian/patches/06_mysql_connect_port.dpatch	2008-02-27 21:12:15 UTC (rev 4654)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_mysql_connect_port.dpatch by Monty Taylor <monty at inaugust.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allows port settings in my.cnf files to work properly.
+## DP: Patch from https://sourceforge.net/tracker/?func=detail&aid=1761612&group_id=22307&atid=374932
+
+ at DPATCH@
+diff -urNad python-mysqldb-1.2.2~/_mysql.c python-mysqldb-1.2.2/_mysql.c
+--- python-mysqldb-1.2.2~/_mysql.c	2008-02-27 12:57:51.351846703 -0800
++++ python-mysqldb-1.2.2/_mysql.c	2008-02-27 12:58:10.404183220 -0800
+@@ -481,7 +481,7 @@
+ #endif
+ 	char *host = NULL, *user = NULL, *passwd = NULL,
+ 		*db = NULL, *unix_socket = NULL;
+-	uint port = MYSQL_PORT;
++	uint port = 0;
+ 	uint client_flag = 0;
+ 	static char *kwlist[] = { "host", "user", "passwd", "db", "port",
+ 				  "unix_socket", "conv",


Property changes on: packages/python-mysqldb/trunk/debian/patches/06_mysql_connect_port.dpatch
___________________________________________________________________
Name: svn:executable
   + *