Branch: Tag:

2017-11-22

2017-11-22 14:15:45 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'patches/mariadb-10.2' into 8.1

* patches/mariadb-10.2:
Mysql: Support MariaDB 10.2 headerfiles.

1850:   {    pop_n_elems(args);    + #if defined(HAVE_MARIADB_GET_INFO) && defined(HAVE_MARIADB_CLIENT_VERSION) +  /* MariaDB 10.2 and later (and probably some earlier versions as well). */ +  push_static_text("MariaDB/"); +  { +  char *vers = NULL; +  if (mariadb_get_info(NULL, MARIADB_CLIENT_VERSION, &vers) < 0) { +  vers = "unknown"; +  } +  push_text(vers); +  } +  f_add(2); + #else + #ifndef MYSQL_SERVER_VERSION +  /* NB: MariaDB 10.2 <mysql/mysql.h> doesn't include this file, +  * and also doesn't define MYSQL_SERVER_VERSION. +  */ + #include <mysql/mysql_version.h> + #endif +    #ifndef MYSQL_COMPILATION_COMMENT -  + #ifdef LIBMARIADB + #define MYSQL_COMPILATION_COMMENT "MariaDB" + #else   #define MYSQL_COMPILATION_COMMENT "MySQL (Copyright Abandoned)"   #endif -  + #endif    -  + #ifdef LIBMYSQL_VERSION +  /* MariaDB 10.2 and later (and probably some earlier versions as well). */ +  push_static_text(MYSQL_COMPILATION_COMMENT "/" LIBMYSQL_VERSION); + #else +  /* Older MySQL and MariaDB. */    push_static_text(MYSQL_COMPILATION_COMMENT "/" MYSQL_SERVER_VERSION); -  + #endif + #endif   }      /*! @endmodule