revision-id: f65f40bb35eb521cc08ca4b61e3bc4dc838ac25f (mariadb-10.2.22-21-gf65f40bb35e) parent(s): cac14b92252b3e7bcbebb8090cdeb2ac47143d1d 5a87e3ee874d04325bc6f106c9862c96a6a35172 author: Jan Lindström committer: Jan Lindström timestamp: 2019-02-28 13:08:11 +0200 message: Merge remote-tracking branch 'origin/10.1' into 10.2 mysql-test/r/create_drop_role.result | 9 +++++++++ mysql-test/t/create_drop_role.test | 11 +++++++++++ sql/handler.cc | 38 ++++++++++++++++++++++++------------ sql/sql_acl.cc | 12 ++++++++++++ storage/innobase/include/ut0wqueue.h | 13 +++++------- storage/innobase/ut/ut0wqueue.cc | 19 +++++++++--------- support-files/wsrep.cnf.sh | 4 ++-- 7 files changed, 73 insertions(+), 33 deletions(-) diff --cc sql/sql_acl.cc index 6958098d4a6,6052284428e..537dcc77c8c --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@@ -10115,7 -9437,9 +10115,8 @@@ bool mysql_create_user(THD *thd, List < String wrong_users; LEX_USER *user_name; List_iterator <LEX_USER> user_list(list); - TABLE_LIST tables[TABLES_MAX]; bool binlog= false; + bool some_users_dropped= false; DBUG_ENTER("mysql_create_user"); DBUG_PRINT("entry", ("Handle as %s", handle_as_role ? "role" : "user")); diff --cc storage/innobase/include/ut0wqueue.h index 771d8d6ae5c,dcd3feabe72..3a96d7d4059 --- a/storage/innobase/include/ut0wqueue.h +++ b/storage/innobase/include/ut0wqueue.h @@@ -1,6 -1,7 +1,7 @@@ /***************************************************************************** -Copyright (c) 2006, 2009, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved. + Copyright (c) 2017, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@@ -58,19 -61,16 +59,15 @@@ Add a work item to the queue. * void ib_wqueue_add( /*==========*/ - ib_wqueue_t* wq, /*!< in: work queue */ - void* item, /*!< in: work item */ - mem_heap_t* heap); /*!< in: memory heap to use for allocating the - list node */ + ib_wqueue_t* wq, /*!< in: work queue */ + void* item, /*!< in: work item */ + mem_heap_t* heap); /*!< in: memory heap to use for + allocating the list node */ - /******************************************************************** - Check if queue is empty. */ - ibool - ib_wqueue_is_empty( - /*===============*/ - /* out: TRUE if queue empty - else FALSE */ - const ib_wqueue_t* wq); /* in: work queue */ + /** Check if queue is empty. + @param wq wait queue + @return whether the queue is empty */ + bool ib_wqueue_is_empty(ib_wqueue_t* wq); /****************************************************************//** Wait for a work item to appear in the queue. diff --cc storage/innobase/ut/ut0wqueue.cc index ccd5c10555c,fce39bd817e..35f14fd20fe --- a/storage/innobase/ut/ut0wqueue.cc +++ b/storage/innobase/ut/ut0wqueue.cc @@@ -1,7 -1,7 +1,7 @@@ /***************************************************************************** -Copyright (c) 2006, 2011, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2006, 2015, Oracle and/or its affiliates. All Rights Reserved. - Copyright (c) 2017, MariaDB Corporation. All Rights Reserved. + Copyright (c) 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@@ -201,16 -193,16 +201,15 @@@ ib_wqueue_nowait return (node ? node->data : NULL); } - /******************************************************************** - Check if queue is empty. */ - ibool - ib_wqueue_is_empty( - /*===============*/ - /* out: TRUE if queue empty - else FALSE */ - const ib_wqueue_t* wq) /* in: work queue */ - + /** Check if queue is empty. + @param wq wait queue + @return whether the queue is empty */ + bool ib_wqueue_is_empty(ib_wqueue_t* wq) { - return(ib_list_is_empty(wq->items)); + mutex_enter(&wq->mutex); + bool is_empty = ib_list_is_empty(wq->items); + mutex_exit(&wq->mutex); + return is_empty; } /********************************************************************