mysql-5.5.34 merge

(some patches reverted, test case added)
This commit is contained in:
Sergei Golubchik 2013-11-19 13:16:25 +01:00
commit fa3f8a18b2
91 changed files with 951 additions and 632 deletions

View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2000, 2011, Oracle and/or its affiliates.
Copyright (c) 2000, 2013, Oracle and/or its affiliates.
Copyright (c) 2009, 2013, Monty Program Ab.
This program is free software; you can redistribute it and/or modify
@ -1276,8 +1276,7 @@ static void mysql_change_db_impl(THD *thd,
we just call THD::reset_db(). Since THD::reset_db() does not releases
the previous database name, we should do it explicitly.
*/
my_free(thd->db);
thd->set_db(NULL, 0);
thd->reset_db(new_db_name->str, new_db_name->length);
}