Merge pull request #678 from jconroy77/no_ver_check

sodabrew · sodabrew · commit 063f4b23814c · 2015-09-09T13:54:07.000-07:00
Only do library version check in Windows environment
diff --git a/ext/mysql2/client.c b/ext/mysql2/client.c
@@ -1215,6 +1215,7 @@ static VALUE rb_mysql_client_prepare_statement(VALUE self, VALUE sql) {
 }
 
 void init_mysql2_client() {
+#ifdef _WIN32
   /* verify the libmysql we're about to use was the version we were built against
      https://github.com/luislavena/mysql-gem/commit/a600a9c459597da0712f70f43736e24b484f8a99 */
   int i;
@@ -1232,6 +1233,7 @@ void init_mysql2_client() {
       return;
     }
   }
+#endif
 
   /* Initializing mysql library, so different threads could call Client.new */
   /* without race condition in the library */

Original file line number	Diff line number	Diff line change
`@@ -1215,6 +1215,7 @@ static VALUE rb_mysql_client_prepare_statement(VALUE self, VALUE sql) {`
`1215`	`1215`	`}`
`1216`	`1216`
`1217`	`1217`	`void init_mysql2_client() {`
	`1218`	`+#ifdef _WIN32`
`1218`	`1219`	`/* verify the libmysql we're about to use was the version we were built against`
`1219`	`1220`	`https://github.com/luislavena/mysql-gem/commit/a600a9c459597da0712f70f43736e24b484f8a99 */`
`1220`	`1221`	`int i;`
`@@ -1232,6 +1233,7 @@ void init_mysql2_client() {`
`1232`	`1233`	`return;`
`1233`	`1234`	`}`
`1234`	`1235`	`}`
	`1236`	`+#endif`
`1235`	`1237`
`1236`	`1238`	`/* Initializing mysql library, so different threads could call Client.new */`
`1237`	`1239`	`/* without race condition in the library */`