search

lunarmodules / luasql

LuaSQL is a simple interface from Lua to a DBMS.
http://lunarmodules.github.io/luasql
545 stars 191 forks source link

Support building with newer MariaDB versions #75

Closed fweimer closed 7 years ago

fweimer commented 7 years ago

Recent versions of mysql.h, as provided by MariaDB, do not include mysql_version.h anymore, but use mariadb_version.h instead, which defines MARIADB_CLIENT_VERSION_STR.

tomasguisasola commented 7 years ago

Hi Florian

Thanks for you information. But I think you mistyped the name of the macro MYSQL_SERVER_VERSION (your code doesn't compile in my environment). I made a small correction and uploaded it to Git. Please check if it works for you then I could release a new version.

Regards, Tomás

On 2017-07-31 04:23, Florian Weimer wrote:

Recent versions of mysql.h, as provided by MariaDB, do not include mysql_version.h anymore, but use mariadb_version.h instead, which defines MARIADB_CLIENT_VERSION_STR.

YOU CAN VIEW, COMMENT ON, OR MERGE THIS PULL REQUEST ONLINE AT:

https://github.com/keplerproject/luasql/pull/75 [1]

COMMIT SUMMARY

  • Support building with newer MariaDB versions

FILE CHANGES

  • M src/ls_mysql.c [2] (6)

PATCH LINKS:

-- You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub [1], or mute the thread [5].

*

Links:

[1] https://github.com/keplerproject/luasql/pull/75 [2] https://github.com/keplerproject/luasql/pull/75/files#diff-0 [3] https://github.com/keplerproject/luasql/pull/75.patch [4] https://github.com/keplerproject/luasql/pull/75.diff [5] https://github.com/notifications/unsubscribe-auth/AAIA7V03Of2koPmJf1PD729uaCKrpN0pks5sTYDjgaJpZM4On_je

fweimer commented 7 years ago

Oh, sorry about that. Not sure how it happened. I don't see your change yet, though, but I agree that it is needed for building against the MySQL libraries.

tomasguisasola commented 7 years ago

Hi Florian

I forgot to git-push. Did it just now! Check it out, please.

Regards, Tomás

On 2017-07-31 09:50, Florian Weimer wrote:

Oh, sorry about that. Not sure how it happened. I don't see your change yet, though, but I agree that it is needed for building against the MySQL libraries.

-- You are receiving this because you commented. Reply to this email directly, view it on GitHub [1], or mute the thread [2].

*

Links:

[1] https://github.com/keplerproject/luasql/pull/75#issuecomment-319057652 [2] https://github.com/notifications/unsubscribe-auth/AAIA7Vq6HQkWVpb5s7gHdGEeiI8yoJAPks5sTc13gaJpZM4On_je

fweimer commented 7 years ago

Looks good. Thanks.