Merge lp://staging/myconnpy/0.1 into lp://staging/~geertjmvdk/myconnpy/main
Proposed by
Geert JM Vanderkelen
| Status: | Rejected |
|---|---|
| Rejected by: | Geert JM Vanderkelen |
| Proposed branch: | lp://staging/myconnpy/0.1 |
| Merge into: | lp://staging/~geertjmvdk/myconnpy/main |
| Diff against target: |
979 lines (+377/-54) (has conflicts) 48 files modified
ChangeLog (+201/-2) README (+4/-0) make_release.py (+4/-0) python2/examples/client.py (+4/-0) python2/mysql/connector/__init__.py (+1/-1) python2/mysql/connector/_version.py (+4/-0) python2/mysql/connector/connection.py (+6/-2) python2/mysql/connector/constants.py (+1/-1) python2/mysql/connector/conversion.py (+2/-2) python2/mysql/connector/cursor.py (+2/-2) python2/mysql/connector/dbapi.py (+1/-1) python2/mysql/connector/errors.py (+4/-0) python2/mysql/connector/mysql.py (+1/-1) python2/mysql/connector/protocol.py (+1/-1) python2/mysql/connector/utils.py (+1/-1) python2/tests/__init__.py (+2/-2) python2/tests/test_bugs.py (+43/-1) python2/tests/test_constants.py (+2/-2) python2/tests/test_conversion.py (+2/-2) python2/tests/test_cursor.py (+2/-2) python2/tests/test_examples.py (+2/-2) python2/tests/test_mysql_datatypes.py (+2/-2) python2/tests/test_pep249.py (+1/-1) python2/tests/test_protocol.py (+1/-1) python2/tests/test_utils.py (+1/-1) python3/mysql/connector/__init__.py (+1/-1) python3/mysql/connector/_version.py (+4/-0) python3/mysql/connector/connection.py (+6/-2) python3/mysql/connector/constants.py (+1/-1) python3/mysql/connector/conversion.py (+1/-1) python3/mysql/connector/cursor.py (+1/-1) python3/mysql/connector/dbapi.py (+1/-1) python3/mysql/connector/errors.py (+1/-1) python3/mysql/connector/mysql.py (+1/-1) python3/mysql/connector/protocol.py (+1/-1) python3/mysql/connector/utils.py (+1/-1) python3/tests/__init__.py (+1/-1) python3/tests/test_bugs.py (+43/-1) python3/tests/test_constants.py (+2/-2) python3/tests/test_conversion.py (+2/-2) python3/tests/test_cursor.py (+1/-1) python3/tests/test_examples.py (+2/-2) python3/tests/test_mysql_datatypes.py (+1/-1) python3/tests/test_pep249.py (+1/-1) python3/tests/test_protocol.py (+1/-1) python3/tests/test_utils.py (+1/-1) setup.py (+4/-0) unittests.py (+4/-0) Text conflict in ChangeLog Text conflict in README Text conflict in make_release.py Text conflict in python2/examples/client.py Text conflict in python2/mysql/connector/_version.py Text conflict in python2/mysql/connector/connection.py Text conflict in python2/mysql/connector/errors.py Text conflict in python3/mysql/connector/_version.py Text conflict in python3/mysql/connector/connection.py Text conflict in setup.py Text conflict in unittests.py |
| To merge this branch: | bzr merge lp://staging/myconnpy/0.1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Geert JM Vanderkelen | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 243. By Geert JM Vanderkelen
-
Fix: examples.
config. Config. dbinfo( ) not returning TCP port o Bug lp:586003
o Config.dbinfo() now includes the TCP port
o Adding test case
o Updating ChangeLog - 242. By Geert JM Vanderkelen
-
Preparing release 0.1.5-devel
- 241. By Geert JM Vanderkelen
-
Copyright change to Oracle
o Change copyright in all files
o Fixing a silly typo - 240. By Geert JM Vanderkelen
-
Critical bug fix: impossible to select big results
o It was impossible to select big result sets.
o Fixed for both Python2 and Python3.
o Added test case for bug lp:586003 and lp:551533
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
