summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #44 from emonty/masterHEADmasterAndy Dustman2014-01-024-527/+7
|\ | | | | Stop using distribute
| * Merge https://github.com/farcepest/MySQLdb1 into merge-upstreamMonty Taylor2014-01-0210-26/+109
| |\ | |/ |/|
* | Merge pull request #29 from msabramo/toxAndy Dustman2013-11-212-0/+12
|\ \ | | | | | | Add tox.ini for tox (http://tox.testrun.org/)
| * | tox.ini: Add ipdb as a dep because it's very useful for debuggingMarc Abramowitz2013-09-301-0/+1
| | |
| * | Add support for toxMarc Abramowitz2013-09-302-0/+11
| | |
* | | Update .travis.ymlAndy Dustman2013-11-211-1/+0
| | | | | | | | | It seems Travis no longer supports Python 2.5.
* | | Merge pull request #26 from chipturner/masterAndy Dustman2013-11-211-7/+15
|\ \ \ | | | | | | | | Extend read_timeout support to also include write_timeouts
| * | | Extend read_timeout support to also include write_timeoutsChip Turner2013-08-231-7/+15
| |/ /
* | | Merge pull request #30 from msabramo/assertEqualsAndy Dustman2013-11-211-1/+1
|\ \ \ | | | | | | | | Change one assertTrue to assertEquals to get better failure output
| * | | Change one assertTrue to assertEquals to get better failure outputMarc Abramowitz2013-09-301-1/+1
| |/ /
* | | Merge pull request #32 from methane/autocommitAndy Dustman2013-11-212-16/+23
|\ \ \ | | | | | | | | More precise get_autocommit based on server_status.
| * | | Remove unused variable.INADA Naoki2013-10-021-2/+0
| | | |
| * | | More precise get_autocommit based on server_status.INADA Naoki2013-10-022-14/+23
| |/ /
* | | Merge pull request #34 from tyzhnenko/test-and-fix-issue-33Andy Dustman2013-11-211-1/+1
|\ \ \ | | | | | | | | Fix cut off SQL query when its contained `))`
| * | | Fix cut off SQL query when its contained `))`, edit insert_valuesDima Tyzhnenko2013-10-071-1/+1
| |/ / | | | | | | | | | regexp. Fixes issue #33.
* | | Merge pull request #35 from methane/staticAndy Dustman2013-11-211-2/+3
|\ \ \ | | | | | | | | remove -lmysqlclient when static linking.
| * | | remove -lmysqlclient when static linking.INADA Naoki2013-10-251-2/+3
| |/ /
* | | Merge pull request #36 from Multiposting/masterAndy Dustman2013-11-212-4/+17
|\ \ \ | | | | | | | | Fix the conversion of list or tuple args to SQL.
| * | | Also fix executemany().Guillaume Bandet2013-11-051-1/+7
| | | |
| * | | Syntax fix for python 2.5 support.Guillaume Bandet2013-11-051-1/+2
| | | |
| * | | Fix the conversion of list or tuple args to a SQL.Guillaume Bandet2013-11-042-3/+9
| |/ / | | | | | | | | | | | | | | | When there is one element on the list, the generated SQL was (1,) (python notation of a single element tuple, which is not valid in SQL.
* | | Merge pull request #38 from olive-oasis/masterAndy Dustman2013-11-211-1/+8
|\ \ \ | |/ / |/| | microsecond-bug-fix for datetime.datetime
| * | microsecond-bug-fixJinuk2013-11-081-3/+6
| | | | | | | | | | | | | | | | | | | | | When the MySQL Datetime Fraction is less than 6, microseconds set incorrectly. For example, you set the field, Datetime(3). Then this library read the time `2013-11-07 10:27:35.705` as `2013-11-08 10:27:35.000705`.
| * | microsecond-bug-fix for datetime.datetimejinuk84.kim2013-11-081-1/+5
|/ /
* | Merge pull request #12 from KLab/autocommit_onAndy Dustman2013-08-181-2/+30
|\ \ | | | | | | Support keyword argument to initially autocommit=on
| * | 'BEGIN' on __enter__ if autocommit is enabled.INADA Naoki2013-05-221-3/+24
| | |
| * | Fix typo.INADA Naoki2013-05-211-1/+1
| | |
| * | autocommit=None means using server default.INADA Naoki2013-05-211-2/+6
| | |
| * | Merge branch 'master' of https://github.com/farcepest/MySQLdb1 into ↵INADA Naoki2013-02-010-0/+0
| |\ \ | | | | | | | | | | | | autocommit_on
| * | | Support `autocommit=True` for constructor argument.INADA Naoki2013-01-051-1/+4
| | | |
* | | | Merge pull request #25 from tyzhnenko/microsecond-bug-fixAndy Dustman2013-08-181-6/+14
|\ \ \ \ | | | | | | | | | | Fix problem in Datetime with microsecond returns (Issue #24)
| * | | | Fix problem with return None if Datetime field contained microsecond (Issue #24)Dima Tyzhnenko2013-07-151-6/+14
| | |/ / | |/| |
* | | | Merge pull request #18 from tseaver/do_not_force_distributeAndy Dustman2013-08-181-2/+5
|\ \ \ \ | |/ / / |/| | | If setuptools is importable, don't force use of 'distribute'.
| * | | If setuptools is importable, don't force use of 'distribute'.Tres Seaver2013-06-141-2/+5
|/ / / | | | | | | | | | Allows use of post-merge setuptools 0.7.
| | * Remove distribute_setup.py reference in MANIFESTMonty Taylor2014-01-021-1/+0
| | | | | | | | | | | | | | | We're not using it anymore, remove the setuptools warning about it not existing.
| | * Replace raise Error with distutils exception.Monty Taylor2013-06-231-5/+7
| | | | | | | | | | | | Distutils has an exceptions heirarchy. Use it.
| | * Remove distribute dependency.Monty Taylor2013-06-233-518/+0
| |/ |/| | | | | | | | | Distribute has been merged with upstream setuptools. The two are incompatible now, so MySQL-python is uninstallable on systems with setuptools >= 0.7 installed.
* | Merge pull request #8 from KLab/cleanupAndy Dustman2013-01-311-21/+20
|\ \ | |/ | | Extraneous blank line removal and other small spacing cleanups.
| * remove unused lines.INADA Naoki2013-01-051-21/+20
|/
* Version bumpMySQLdb-1.2.4farcepest2013-01-013-5/+11
|
* Version bumpMySQLdb-1.2.4c1farcepest2012-11-022-2/+9
|
* Fix some broken types module references.pypy-fixesfarcepest2012-11-021-2/+2
|
* Tell Travis to start testing PyPy as well.farcepest2012-10-171-0/+1
|
* PyPy fixes, and probably some reference issues for CPython too.farcepest2012-10-175-5/+21
| | | | Derived from a patch at https://bitbucket.org/pypy/compatibility/wiki/edit/mysql-python
* Version bump.MySQLdb-1.2.4b5farcepest2012-10-114-6/+12
|
* Merge branch 'sphinx' into MySQLdb-1.2farcepest2012-10-1111-0/+739
|\
| * Doc overhaul with sphinxfarcepest2012-10-0811-0/+739
| |
* | Misplaced conditional comma. Fixes issue #6.farcepest2012-10-111-4/+3
| |
* | Removing the download_url as the source is available on PyPi.farcepest2012-10-081-1/+0
| |
* | HISTORY updatefarcepest2012-10-081-0/+5
| |