diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /libmysql/libmysql.c | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 78a9cd8b9b5..f5286b8fa50 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -384,9 +384,9 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, if (rc == 0) { /* Free old connect information */ - my_free(saved_user, MYF(MY_ALLOW_ZERO_PTR)); - my_free(saved_passwd, MYF(MY_ALLOW_ZERO_PTR)); - my_free(saved_db, MYF(MY_ALLOW_ZERO_PTR)); + my_free(saved_user); + my_free(saved_passwd); + my_free(saved_db); /* alloc new connect information */ mysql->user= my_strdup(mysql->user, MYF(MY_WME)); @@ -986,8 +986,8 @@ mysql_get_server_info(MYSQL *mysql) my_bool STDCALL mariadb_connection(MYSQL *mysql) { - return (strinstr(mysql->server_version, "MariaDB") != 0 || - strinstr(mysql->server_version, "-maria-") != 0); + return (strstr(mysql->server_version, "MariaDB") || + strstr(mysql->server_version, "-maria-")); } const char * STDCALL |