Post-merge fixes for bugs 34587 and 32265.
mysql-test/r/view.result: Drop created view. mysql-test/t/view.test: Update test result. sql/sql_cursor.cc: Fix compilation failure. tests/mysql_client_test.c: Manual merge.
This commit is contained in:
parent
96b4648b01
commit
88421ee503
@ -3729,6 +3729,7 @@ create view a as select 1;
|
|||||||
end|
|
end|
|
||||||
call p();
|
call p();
|
||||||
call p();
|
call p();
|
||||||
|
drop view a;
|
||||||
drop procedure p;
|
drop procedure p;
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
# -- Bug#34337: Server crash when Altering a view using a table name.
|
# -- Bug#34337: Server crash when Altering a view using a table name.
|
||||||
|
@ -3619,6 +3619,7 @@ end|
|
|||||||
delimiter ;|
|
delimiter ;|
|
||||||
call p();
|
call p();
|
||||||
call p();
|
call p();
|
||||||
|
drop view a;
|
||||||
drop procedure p;
|
drop procedure p;
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
@ -588,7 +588,7 @@ int Materialized_cursor::fill_item_list(THD *thd, List<Item> &send_fields)
|
|||||||
end:
|
end:
|
||||||
thd->restore_active_arena(this, &backup_arena);
|
thd->restore_active_arena(this, &backup_arena);
|
||||||
/* Check for thd->is_error() in case of OOM */
|
/* Check for thd->is_error() in case of OOM */
|
||||||
return rc || thd->net.report_error;
|
return rc || thd->is_error();
|
||||||
}
|
}
|
||||||
|
|
||||||
int Materialized_cursor::open(JOIN *join __attribute__((unused)))
|
int Materialized_cursor::open(JOIN *join __attribute__((unused)))
|
||||||
|
@ -16109,8 +16109,6 @@ static void test_bug24179()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Bug#32265 Server returns different metadata if prepared statement is used
|
Bug#32265 Server returns different metadata if prepared statement is used
|
||||||
*/
|
*/
|
||||||
@ -16191,6 +16189,7 @@ static void test_bug32265()
|
|||||||
DBUG_VOID_RETURN;
|
DBUG_VOID_RETURN;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
Bug#28075 "COM_DEBUG crashes mysqld"
|
Bug#28075 "COM_DEBUG crashes mysqld"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user