Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase: 8.4.0 #184

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open

Rebase: 8.4.0 #184

wants to merge 26 commits into from

Conversation

karenc-bq
Copy link
Contributor

@karenc-bq karenc-bq commented Jun 18, 2024

Summary

Rebase commits from 8.3.0 to 8.4.0: mysql/mysql-connector-odbc@8.3.0...8.4.0

Description

Review Status

  • This is ready for review
  • This is complete

Additional Reviewers

Bogdan Degtyariov and others added 23 commits June 18, 2024 12:04
…es support

Change-Id: I2ed95b4dfdb9fbd6bf17ae24dd2c6302b30f170a
… ODBC 8.1 connector

Change-Id: Ibc6e32a9e5105d7cc721d1c36290f7cf53c88642
Change-Id: Idb19f0f4b9149c49f22bf20424000013ef6ca283
…when multiple rows are fetched

Change-Id: I5468aaab3730dd6e558a60b13d0fb80388a6a177
Change-Id: If069541d26580a66193530e9c3953df23d3011b7
Change-Id: Iae85cca6881a021fa06c220a1e903a90f6fc8b6d
Change-Id: Iceb537c2305f32e76928add7436e926303500000
Change-Id: I6c5ea26bcc6dbed1443d059ad7d5021fc5b58aef
…to 0 value

Change-Id: I274a6d289faf53d5abbbfbf544efc1c59c6311ae
Change-Id: I165360a99091f144b8c51e2dd5c731d9783f9a00
Starting in GCC 14, it will begin enforcing C99 so errors regarding
incompatible pointer types and so on will be more common. There are
currently three C99 build errors that occur:

1:
test/odbctap.h:107:18: error: implicit declaration of function `wcslen'
[-Wimplicit-function-declaration]
  107 |   for (i= 0; i < wcslen(wstr); ++i)

2:
test/odbctap.h:601:20: error: initialization of `SQLWCHAR *'
{aka `short unsigned int *'} from incompatible pointer type

`wchar_t *' {aka `int *'} [-Wincompatible-pointer-types]
  601 |   SQLWCHAR *val_a= (a), *val_b= (b);

3:
error: passing argument 6 of `SQLGetData' from incompatible pointer
type [-Wincompatible-pointer-types]
 1172 |   ok_stmt(hstmt, SQLGetData(hstmt, 0, SQL_C_BOOKMARK, abookmark, 255, &outlen));

The first is fixed by importing <wchar.h>, the second by changing
SQLWCHAR to wchar_t, and the third by setting outlen's type to the
SQLLEN type.
Change-Id: I8399fc712322c590f73f84a6901ac82069e42fe6
Change-Id: Ide9501d1f5312e3bb6e15399dde35a1e9985378c
Change-Id: I0573c06596818e00128a52076d3814e61056a6ba
@karenc-bq karenc-bq self-assigned this Jun 18, 2024
@karenc-bq karenc-bq added the ready for review Pull requests that are ready to be reviewed label Jun 18, 2024
@karenc-bq karenc-bq force-pushed the rebase/8.4.0 branch 2 times, most recently from aa9bb60 to d85f211 Compare June 18, 2024 19:57
Copy link
Contributor

@ColinKYuen ColinKYuen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Went thru the changes, but its out of date from our mainline now with conflicts 😔

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review Pull requests that are ready to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants