diff --git a/VERSION b/VERSION index 43aaa087..25613975 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.3-stable+timestamp.2013.09.19.21.32.38 +Version 2.6.3-stable+timestamp.2013.09.19.21.43.19 diff --git a/gluon/dal.py b/gluon/dal.py index 4b3bb94d..bba0e469 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -310,6 +310,11 @@ if not 'google' in DRIVERS: except ImportError: LOGGER.debug('no MySQL driver MySQLDB') + try: + import mysql.connector as mysqlconnector + DRIVERS.append("MySQL(mysqlconnector)") + except ImportError: + LOGGER.debug("no driver mysql.connector") try: import psycopg2 @@ -2445,7 +2450,7 @@ class JDBCSQLiteAdapter(SQLiteAdapter): class MySQLAdapter(BaseAdapter): - drivers = ('MySQLdb','pymysql') + drivers = ('MySQLdb','pymysql', 'mysqlconnector') commit_on_alter_table = True support_distributed_transaction = True