Commit aef14932 authored by Olivier Bertrand's avatar Olivier Bertrand

Protect Info function against NULL g pointer

  modified:   storage/connect/ha_connect.cc

Update failing test
  modified:   storage/connect/mysql-test/connect/t/secure_file_priv.test
parent de1a9b17
......@@ -4065,7 +4065,12 @@ int ha_connect::info(uint flag)
DBUG_ENTER("ha_connect::info");
if (trace)
if (!g) {
my_message(ER_UNKNOWN_ERROR, "Cannot get g pointer", MYF(0));
DBUG_RETURN(HA_ERR_INTERNAL_ERROR);
} // endif g
if (trace)
htrc("%p In info: flag=%u valid_info=%d\n", this, flag, valid_info);
// tdbp must be available to get updated info
......
......@@ -10,4 +10,4 @@ let $SECUREDIR= `select @@secure_file_priv`;
INSERT INTO t1 VALUES (10);
SELECT * FROM t1;
DROP TABLE t1;
--remove_file $SECUREDIR/t1.dbf
--remove_file $MYSQL_TMP_DIR/t1.dbf
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment