496 Commits

Author SHA1 Message Date
0f8d86cc87 Prep for 1.2.4b4 release MySQLdb-1.2.4b4 2012-10-08 11:47:09 -04:00
2325200a7d Revert to using utf8 for default testing setup as utf8mb4 is not ubiquitous. 2012-10-08 11:37:35 -04:00
c53d95fdd6 Update HISTORY 2012-10-08 11:34:48 -04:00
7d4993a53c Workaround for recommended MySQL 5.5 utf8mb4 character set, which is not recognized by Python yet. 2012-10-05 14:01:51 -04:00
f982ab42f5 Merge remote-tracking branch 'origin/MySQLdb-1.2' into MySQLdb-1.2 2012-10-04 14:32:33 -04:00
119b6b2c97 Merge with jeansch/master 2012-10-04 14:32:06 -04:00
4f9d95bc5a Merge branch 'jensch-master' into MySQLdb-1.2 2012-10-04 14:20:06 -04:00
4e6c7c0e08 Remove obsolete setuptools bootstrap 2012-10-04 13:48:09 -04:00
417088a3aa Exposed 'read_timeout' option. 2012-10-04 13:45:26 -04:00
36b8d1d4e8 Restore README.md, rename the old README as INSTALL 2012-10-04 13:43:11 -04:00
7a846cf5e3 Allow pip install from git
Merged with modifications from a815269010
2012-10-04 13:34:39 -04:00
0164ffeb25 Let's not forget history... 2012-10-03 14:11:05 -04:00
973660bdc6 Version 1.2.4b3 MySQLdb-1.2.4b3 2012-10-03 13:34:33 -04:00
cd44524fef Patch 4/4: Fix TEXT vs. BLOB conversion.
This patch assumes an applied patch 3 (https://sourceforge.net/p/mysql-python/patches/79/). Looks a bit like a hack, but the infrastructure doesn't seem to allow anything else. And it works here very well. I'm not sure, how it works with very old mysql versions (<= 4.0).

https://sourceforge.net/p/mysql-python/patches/80/
2012-10-03 13:20:19 -04:00
c05a2c6a50 Patch 3/4: _mysql.c reference counting and exception issues
This patch fixes a reference leak and improves the error handling in the converter mapping code. Rather accidentially it also drops the cleanup: label and the gotos ;)

https://sourceforge.net/p/mysql-python/patches/79/
2012-10-03 13:17:35 -04:00
1c33baf352 Patch 2/4: executemany-regex improvement. It should match better and faster now. It also may be more readable.
https://sourceforge.net/p/mysql-python/patches/78/
2012-10-03 13:15:38 -04:00
a7f55a5d6a Patch 1/4: Minor exception handling improvements (don't swallow program exits)
https://sourceforge.net/p/mysql-python/patches/77/
2012-10-03 13:10:25 -04:00
fa248cf608 Merge branch 'master' into MySQLdb-1.2 2012-10-02 14:56:05 -04:00
8685efce82 I don't know how this got lost. Git makes me feel like a git. 2012-10-02 14:53:29 -04:00
080902e21e Merge remote-tracking branch 'origin/master'
Conflicts:
	.travis.yml
	MySQLdb/tests/test_MySQLdb_capabilities.py
	MySQLdb/tests/test_MySQLdb_dbapi20.py
	MySQLdb/tests/test_MySQLdb_nonstandard.py
2012-10-02 14:39:15 -04:00
e2c396c245 README rewrite 2012-10-02 14:15:59 -04:00
a6dcb3b683 Travis testing fixes
Squashed commit of the following:

commit 17fb6798cd94b0ddae7390b5a7c6262b40de04dc
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 14:03:57 2012 -0400

    Add a build status widget for Travis

commit 1cd83ef78e628d6755eaa6dfc84d1205519381d4
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 13:59:48 2012 -0400

    Rewrite the repository root README

commit 72848c84bce119b34469ea9113a616bfe8ee4202
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 13:50:00 2012 -0400

    Somehow I missed this connection setup

commit 413c3b6623c65e9591388e3fc3b65f88b7be0ce4
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 13:19:09 2012 -0400

    Giving Travis it's own database with utf8 charset in hopes this will fix the callproc test (which works everywhere else)

commit 400112e0c348b58d5d11a9a9b1cd4d88f02ba23d
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 13:06:00 2012 -0400

    Update the Travis config so that the tests use the correct database configuration file

commit ae94e44ed10f9c9ef7e14ea94ac522d7c1c6437f
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 12:59:29 2012 -0400

    Add Travis-specific configuration file

commit 3581603f45b754b457b4f5f3c7d58a82bd8c04d5
Merge: f42c369 d0e96c7
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 12:58:00 2012 -0400

    Merge branch 'master' into MySQLdb-1.2

    Conflicts:
    	MySQLdb/tests/test_MySQLdb_capabilities.py
    	MySQLdb/tests/test_MySQLdb_dbapi20.py

commit f42c369300c856c2bbcc440cd68286bca7a93be8
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:43:00 2012 -0400

    Maybe a subshell will do the trick?

commit fb346e1d40ec1861c7b9169d99e787ff4dc8b25f
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:35:50 2012 -0400

    Travis can't build for Python 2.4 it seems, and the test still weren't all running

commit 2f661f09913a2261203ca03720286828680235b1
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:31:40 2012 -0400

    OK, this should hopefully fix the build process for Travis

commit 899c3342b221031c7fa174a506fbb0f71b68d6c0
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:28:14 2012 -0400

    More Travis fixes

commit 8f593def7bf237126aec2b0b85685f271de911e9
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:19:39 2012 -0400

    Fix test script due to source being down one level.

commit 1936b93cf05497450a3d99819dab7a645c157299
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:14:38 2012 -0400

    Test connection tweaks for Travis

commit 9bf8bcf894b98784e3787c9d6a57574a4ae8dced
Merge: 7ae4f55 d551f8a
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:10:58 2012 -0400

    Merge branch 'travis' into MySQLdb-1.2

commit d551f8a8d9c13b03f5ff3255804a5f20a97d93c7
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:05:25 2012 -0400

    Initial Travis setup

commit 7ae4f5549b3fb46cc9b71baeaa96d2e1cc5c86a1
Merge: 235d846 c16bc33
Author: farcepest <farcepest@gmail.com>
Date:   Thu Sep 27 12:49:07 2012 -0400

    Merge remote-tracking branch 'origin/MySQLdb-1.2' into MySQLdb-1.2

commit 235d8466ddd65b3b61f30d51d0bef0a7d13a10fe
Author: farcepest <farcepest@gmail.com>
Date:   Thu Sep 27 12:18:07 2012 -0400

    History updates for 1.2.4b2

commit 5fda4c2579be93cafe571d27527815fbb17945c4
Author: farcepest <farcepest@gmail.com>
Date:   Thu Sep 27 12:06:58 2012 -0400

    Revert raise exc as value statements to raise exc, value since it breaks Python < 2.6.

commit 048b70d90157d9526b89013b51b80afd70883292
Author: farcepest <farcepest@gmail.com>
Date:   Wed Sep 26 16:02:05 2012 -0400

    Fix MySQLdb1-1 Exception format incompatible with previous versions

    Unfortunately, when I broke this, I broke the test at the same time. That should have been a red flag.

commit 162e9e4d84a4b6f2c8320347f2390a9e18af1b29
Author: Andy Dustman <farcepest@gmail.com>
Date:   Tue Sep 25 19:56:49 2012 -0400

    General cleanups
2012-10-02 14:15:12 -04:00
17fb6798cd Add a build status widget for Travis 2012-10-02 14:03:57 -04:00
1cd83ef78e Rewrite the repository root README 2012-10-02 13:59:48 -04:00
72848c84bc Somehow I missed this connection setup 2012-10-02 13:50:00 -04:00
413c3b6623 Giving Travis it's own database with utf8 charset in hopes this will fix the callproc test (which works everywhere else) 2012-10-02 13:19:09 -04:00
400112e0c3 Update the Travis config so that the tests use the correct database configuration file 2012-10-02 13:06:00 -04:00
ae94e44ed1 Add Travis-specific configuration file 2012-10-02 12:59:29 -04:00
3581603f45 Merge branch 'master' into MySQLdb-1.2
Conflicts:
	MySQLdb/tests/test_MySQLdb_capabilities.py
	MySQLdb/tests/test_MySQLdb_dbapi20.py
2012-10-02 12:58:00 -04:00
d0e96c7155 Unify test connection configuration 2012-10-02 12:37:41 -04:00
02d94c48ff Merge pull request #2 from farcepest/MySQLdb-1.2
Add Travis support
2012-10-01 11:45:25 -07:00
f42c369300 Maybe a subshell will do the trick? 2012-10-01 13:43:00 -04:00
fb346e1d40 Travis can't build for Python 2.4 it seems, and the test still weren't all running 2012-10-01 13:35:50 -04:00
2f661f0991 OK, this should hopefully fix the build process for Travis 2012-10-01 13:31:40 -04:00
899c3342b2 More Travis fixes 2012-10-01 13:28:14 -04:00
8f593def7b Fix test script due to source being down one level. 2012-10-01 13:19:39 -04:00
1936b93cf0 Test connection tweaks for Travis 2012-10-01 13:14:38 -04:00
9bf8bcf894 Merge branch 'travis' into MySQLdb-1.2 2012-10-01 13:10:58 -04:00
d551f8a8d9 Initial Travis setup 2012-10-01 13:05:25 -04:00
7ae4f5549b Merge remote-tracking branch 'origin/MySQLdb-1.2' into MySQLdb-1.2 2012-09-27 12:49:07 -04:00
235d8466dd History updates for 1.2.4b2 2012-09-27 12:40:05 -04:00
5fda4c2579 Revert raise exc as value statements to raise exc, value since it breaks Python < 2.6. 2012-09-27 12:40:04 -04:00
048b70d901 Fix MySQLdb1-1 Exception format incompatible with previous versions
Unfortunately, when I broke this, I broke the test at the same time. That should have been a red flag.
2012-09-27 12:40:03 -04:00
162e9e4d84 General cleanups 2012-09-27 12:40:02 -04:00
4af9b70b91 History updates for 1.2.4b2 MySQLdb-1.2.4b2 2012-09-27 12:18:07 -04:00
2b5b909529 Revert raise exc as value statements to raise exc, value since it breaks Python < 2.6. 2012-09-27 12:06:58 -04:00
d1b43681cf Fix MySQLdb1-1 Exception format incompatible with previous versions
Unfortunately, when I broke this, I broke the test at the same time. That should have been a red flag.
2012-09-26 16:02:05 -04:00
129f09ace4 Windows is HELL MySQLdb-1.2.4b1 2012-09-26 11:24:14 -04:00
f60f81d114 Revert "Hopefully this is just a very minor spacing cleanup."
This reverts commit cdc221a8078382f3a0d97b8b43b155a4f6246297.

Conflicts:
	MySQLdb/MANIFEST.in
	MySQLdb/metadata.cfg
2012-09-26 11:18:32 -04:00
d059c92572 There's more to ignore 2012-09-26 10:31:59 -04:00