mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Post-merge fixes for bugs 34587 and 32265.

Browse source
This commit is contained in:
davi@buzz.(none) 2008-02-20 23:30:29 -02:00
parent bf9142825d
commit 919ccd9111
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/view.result
View file

@ -3729,6 +3729,7 @@ create view a as select 1;
end|
call p();
call p();
drop view a;
drop procedure p;
# -----------------------------------------------------------------
# -- Bug#34337: Server crash when Altering a view using a table name.

1
mysql-test/t/view.test
View file

@ -3619,6 +3619,7 @@ end|
delimiter ;|
call p();
call p();
drop view a;
drop procedure p;
###########################################################################

2
sql/sql_cursor.cc
View file

@ -588,7 +588,7 @@ int Materialized_cursor::fill_item_list(THD *thd, List<Item> &send_fields)
end:
thd->restore_active_arena(this, &backup_arena);
/* 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)))

3
tests/mysql_client_test.c
View file

@ -16109,8 +16109,6 @@ static void test_bug24179()
}
/*
/**
Bug#32265 Server returns different metadata if prepared statement is used
*/
@ -16191,6 +16189,7 @@ static void test_bug32265()
DBUG_VOID_RETURN;
}
/*
Bug#28075 "COM_DEBUG crashes mysqld"
*/