Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #44 from emonty/masterHEADmaster | Andy Dustman | 2014-01-02 | 4 | -527/+7 |
|\ | | | | | Stop using distribute | ||||
| * | Merge https://github.com/farcepest/MySQLdb1 into merge-upstream | Monty Taylor | 2014-01-02 | 10 | -26/+109 |
| |\ | |/ |/| | |||||
* | | Merge pull request #29 from msabramo/tox | Andy Dustman | 2013-11-21 | 2 | -0/+12 |
|\ \ | | | | | | | Add tox.ini for tox (http://tox.testrun.org/) | ||||
| * | | tox.ini: Add ipdb as a dep because it's very useful for debugging | Marc Abramowitz | 2013-09-30 | 1 | -0/+1 |
| | | | |||||
| * | | Add support for tox | Marc Abramowitz | 2013-09-30 | 2 | -0/+11 |
| | | | |||||
* | | | Update .travis.yml | Andy Dustman | 2013-11-21 | 1 | -1/+0 |
| | | | | | | | | | It seems Travis no longer supports Python 2.5. | ||||
* | | | Merge pull request #26 from chipturner/master | Andy Dustman | 2013-11-21 | 1 | -7/+15 |
|\ \ \ | | | | | | | | | Extend read_timeout support to also include write_timeouts | ||||
| * | | | Extend read_timeout support to also include write_timeouts | Chip Turner | 2013-08-23 | 1 | -7/+15 |
| |/ / | |||||
* | | | Merge pull request #30 from msabramo/assertEquals | Andy Dustman | 2013-11-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Change one assertTrue to assertEquals to get better failure output | ||||
| * | | | Change one assertTrue to assertEquals to get better failure output | Marc Abramowitz | 2013-09-30 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #32 from methane/autocommit | Andy Dustman | 2013-11-21 | 2 | -16/+23 |
|\ \ \ | | | | | | | | | More precise get_autocommit based on server_status. | ||||
| * | | | Remove unused variable. | INADA Naoki | 2013-10-02 | 1 | -2/+0 |
| | | | | |||||
| * | | | More precise get_autocommit based on server_status. | INADA Naoki | 2013-10-02 | 2 | -14/+23 |
| |/ / | |||||
* | | | Merge pull request #34 from tyzhnenko/test-and-fix-issue-33 | Andy Dustman | 2013-11-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix cut off SQL query when its contained `))` | ||||
| * | | | Fix cut off SQL query when its contained `))`, edit insert_values | Dima Tyzhnenko | 2013-10-07 | 1 | -1/+1 |
| |/ / | | | | | | | | | | regexp. Fixes issue #33. | ||||
* | | | Merge pull request #35 from methane/static | Andy Dustman | 2013-11-21 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | remove -lmysqlclient when static linking. | ||||
| * | | | remove -lmysqlclient when static linking. | INADA Naoki | 2013-10-25 | 1 | -2/+3 |
| |/ / | |||||
* | | | Merge pull request #36 from Multiposting/master | Andy Dustman | 2013-11-21 | 2 | -4/+17 |
|\ \ \ | | | | | | | | | Fix the conversion of list or tuple args to SQL. | ||||
| * | | | Also fix executemany(). | Guillaume Bandet | 2013-11-05 | 1 | -1/+7 |
| | | | | |||||
| * | | | Syntax fix for python 2.5 support. | Guillaume Bandet | 2013-11-05 | 1 | -1/+2 |
| | | | | |||||
| * | | | Fix the conversion of list or tuple args to a SQL. | Guillaume Bandet | 2013-11-04 | 2 | -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/master | Andy Dustman | 2013-11-21 | 1 | -1/+8 |
|\ \ \ | |/ / |/| | | microsecond-bug-fix for datetime.datetime | ||||
| * | | microsecond-bug-fix | Jinuk | 2013-11-08 | 1 | -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.datetime | jinuk84.kim | 2013-11-08 | 1 | -1/+5 |
|/ / | |||||
* | | Merge pull request #12 from KLab/autocommit_on | Andy Dustman | 2013-08-18 | 1 | -2/+30 |
|\ \ | | | | | | | Support keyword argument to initially autocommit=on | ||||
| * | | 'BEGIN' on __enter__ if autocommit is enabled. | INADA Naoki | 2013-05-22 | 1 | -3/+24 |
| | | | |||||
| * | | Fix typo. | INADA Naoki | 2013-05-21 | 1 | -1/+1 |
| | | | |||||
| * | | autocommit=None means using server default. | INADA Naoki | 2013-05-21 | 1 | -2/+6 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/farcepest/MySQLdb1 into ↵ | INADA Naoki | 2013-02-01 | 0 | -0/+0 |
| |\ \ | | | | | | | | | | | | | autocommit_on | ||||
| * | | | Support `autocommit=True` for constructor argument. | INADA Naoki | 2013-01-05 | 1 | -1/+4 |
| | | | | |||||
* | | | | Merge pull request #25 from tyzhnenko/microsecond-bug-fix | Andy Dustman | 2013-08-18 | 1 | -6/+14 |
|\ \ \ \ | | | | | | | | | | | Fix problem in Datetime with microsecond returns (Issue #24) | ||||
| * | | | | Fix problem with return None if Datetime field contained microsecond (Issue #24) | Dima Tyzhnenko | 2013-07-15 | 1 | -6/+14 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #18 from tseaver/do_not_force_distribute | Andy Dustman | 2013-08-18 | 1 | -2/+5 |
|\ \ \ \ | |/ / / |/| | | | If setuptools is importable, don't force use of 'distribute'. | ||||
| * | | | If setuptools is importable, don't force use of 'distribute'. | Tres Seaver | 2013-06-14 | 1 | -2/+5 |
|/ / / | | | | | | | | | | Allows use of post-merge setuptools 0.7. | ||||
| | * | Remove distribute_setup.py reference in MANIFEST | Monty Taylor | 2014-01-02 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | We're not using it anymore, remove the setuptools warning about it not existing. | ||||
| | * | Replace raise Error with distutils exception. | Monty Taylor | 2013-06-23 | 1 | -5/+7 |
| | | | | | | | | | | | | Distutils has an exceptions heirarchy. Use it. | ||||
| | * | Remove distribute dependency. | Monty Taylor | 2013-06-23 | 3 | -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/cleanup | Andy Dustman | 2013-01-31 | 1 | -21/+20 |
|\ \ | |/ | | | Extraneous blank line removal and other small spacing cleanups. | ||||
| * | remove unused lines. | INADA Naoki | 2013-01-05 | 1 | -21/+20 |
|/ | |||||
* | Version bumpMySQLdb-1.2.4 | farcepest | 2013-01-01 | 3 | -5/+11 |
| | |||||
* | Version bumpMySQLdb-1.2.4c1 | farcepest | 2012-11-02 | 2 | -2/+9 |
| | |||||
* | Fix some broken types module references.pypy-fixes | farcepest | 2012-11-02 | 1 | -2/+2 |
| | |||||
* | Tell Travis to start testing PyPy as well. | farcepest | 2012-10-17 | 1 | -0/+1 |
| | |||||
* | PyPy fixes, and probably some reference issues for CPython too. | farcepest | 2012-10-17 | 5 | -5/+21 |
| | | | | Derived from a patch at https://bitbucket.org/pypy/compatibility/wiki/edit/mysql-python | ||||
* | Version bump.MySQLdb-1.2.4b5 | farcepest | 2012-10-11 | 4 | -6/+12 |
| | |||||
* | Merge branch 'sphinx' into MySQLdb-1.2 | farcepest | 2012-10-11 | 11 | -0/+739 |
|\ | |||||
| * | Doc overhaul with sphinx | farcepest | 2012-10-08 | 11 | -0/+739 |
| | | |||||
* | | Misplaced conditional comma. Fixes issue #6. | farcepest | 2012-10-11 | 1 | -4/+3 |
| | | |||||
* | | Removing the download_url as the source is available on PyPi. | farcepest | 2012-10-08 | 1 | -1/+0 |
| | | |||||
* | | HISTORY update | farcepest | 2012-10-08 | 1 | -0/+5 |
| | |