Skip to content

Bugfix/mysql datetime#1899

Closed
Erbengi wants to merge 531 commits intopocoproject:developfrom
Erbengi:bugfix/mysql_datetime
Closed

Bugfix/mysql datetime#1899
Erbengi wants to merge 531 commits intopocoproject:developfrom
Erbengi:bugfix/mysql_datetime

Conversation

@Erbengi
Copy link
Copy Markdown

@Erbengi Erbengi commented Sep 21, 2017

Fixed DateTime binding/extraction for MySQL database #1897

obiltschnig and others added 30 commits September 13, 2016 07:42
@Erbengi Erbengi force-pushed the bugfix/mysql_datetime branch from 97ffdd0 to db80293 Compare September 21, 2017 17:22
@aleks-f
Copy link
Copy Markdown
Member

aleks-f commented Sep 21, 2017

@Erbengi is this a duplicate of #1898 ?

@Erbengi
Copy link
Copy Markdown
Author

Erbengi commented Sep 22, 2017

@aleks-f it is almost the same as #1898 but this one is based on branch poco-1.8.0 and it differs in tests. There is two more tests in develop which I changed according to my fix. I wasn't sure if the change will be merged also to develop so I created two commits - one based on develop and one based on poco-1.8.0.
The common merge base of poco-1.8.0 and develop is very far in history and it not seems that commits from poco-1.8.0 are merged back to develop. If you think that it is not good idea to have two almost same commits, feel free to reject one of the pull requests.

@aleks-f
Copy link
Copy Markdown
Member

aleks-f commented Sep 22, 2017

develop and 1.8 will never be merged - 1.8 is a dead-end, it will be the last release of 1.x series and develop will become 2.0. unfortunately, that means that branches have to be maintained in parallel. So, I'm closing this, will merge 1898, and whatever changes you have to 1.8 branch, please send pulls there

@aleks-f aleks-f closed this Sep 22, 2017
@Erbengi Erbengi deleted the bugfix/mysql_datetime branch November 14, 2018 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.