mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-24 17:25:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-4865 Change related to --log option/variable was merged partially

Browse source 
Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk
(WL#5185 Remove deprecated 5.1 features)
This commit is contained in:
Sergei Golubchik 2013-08-13 13:35:36 +02:00
commit fcf87600a2
58 changed files with 74 additions and 2127 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/mysql_client_fw.c
View file

@ -275,7 +275,9 @@ static my_bool check_have_innodb(MYSQL *conn)
int rc;
my_bool result;
rc= mysql_query(conn, "show variables like 'have_innodb'");
rc= mysql_query(conn,
"SELECT (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') "
"AS `TRUE` FROM information_schema.engines WHERE engine = 'innodb'");
myquery(rc);
res= mysql_use_result(conn);
DIE_UNLESS(res);
@ -283,7 +285,7 @@ static my_bool check_have_innodb(MYSQL *conn)
row= mysql_fetch_row(res);
DIE_UNLESS(row);
result= strcmp(row[1], "YES") == 0;
result= strcmp(row[1], "1") == 0;
mysql_free_result(res);
return result;
}