Merge remote-tracking branch 'pymysql/master' into tornado

Conflicts:
	README.rst
	example.py
	pymysql/tests/__init__.py
	pymysql/tests/test_issues.py
	runtests.py
	tornado_mysql/connections.py
	tornado_mysql/cursors.py
	tornado_mysql/tests/base.py
	tornado_mysql/tests/test_DictCursor.py
	tornado_mysql/tests/test_basic.py
	tox.ini

Author: methane

.travis.databases.json

@@ -1,4 +1,4 @@
 [
-    {"host": "localhost", "user": "root", "passwd": "", "db": "test_pymysql",  "use_unicode": true},
+    {"host": "localhost", "user": "root", "passwd": "", "db": "test_pymysql",  "use_unicode": true, "local_infile": true},
     {"host": "localhost", "user": "root", "passwd": "", "db": "test_pymysql2" }
 ]

.travis.yml

@@ -1,12 +1,20 @@
+sudo: false
 language: python
-python: "2.7"
+python: "3.4"
+env:
+    - TOX_ENV=py26
+    - TOX_ENV=py27
+    - TOX_ENV=py33
+    - TOX_ENV=py34
+    - TOX_ENV=pypy
+    - TOX_ENV=pypy3
 
 install:
-    - pip install -M tox
+    - pip install -U tox
 
 before_script:
     - "mysql -e 'create database test_pymysql  DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'"
     - "mysql -e 'create database test_pymysql2 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'"
     - cp .travis.databases.json tornado_mysql/tests/databases.json
 
-script: tox
+script: tox -e $TOX_ENV

CHANGELOG

@@ -1,6 +1,20 @@
 Changes
 --------
 
+0.6.4 -Support "LOAD LOCAL INFILE".  Thanks @wraziens
+      -Show MySQL warnings after execute query.
+      -Fix MySQLError may be wrapped with OperationalError while connectiong. (#274)
+      -SSCursor no longer attempts to expire un-collected rows within __del__,
+       delaying termination of an interrupted program; cleanup of uncollected
+       rows is left to the Connection on next execute, which emits a
+       warning at that time. (#287)
+
+0.6.3 -Fixed multiple result sets with SSCursor.
+      -Fixed connection timeout.
+      -Fixed literal set syntax to work on Py2.6.
+      -Allow for mysql negative values with 0 hour timedelta.
+      -Added Connection.begin().
+
 0.6.2 -Fixed old password on Python 3.
       -Added support for bulk insert in Cursor.executemany().
       -Added support for microseconds in datetimes and dates before 1900.
@@ -37,7 +51,7 @@ Changes
       -Removed DeprecationWarnings
       -Ran against the MySQLdb unit tests to check for bugs
       -Added support for client_flag, charset, sql_mode, read_default_file,
-       use_unicode, cursorclass, init_command, and connect_timeout. 
+       use_unicode, cursorclass, init_command, and connect_timeout.
       -Refactoring for some more compatibility with MySQLdb including a fake
        pymysql.version_info attribute.
       -Now runs with no warnings with the -3 command-line switch

README.rst

@@ -76,6 +76,7 @@ example_pool
     print(POOL._opened_conns)
 
 
+
 Requirements
 -------------