diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-01 15:23:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-01 15:23:18 +0200 |
| commit | ec40980ddd921a3a765c23cc430c9c219e48ea85 (patch) | |
| tree | 6553832d3d3fb4b2cb39aea6a1d69e54275f6eb2 /sql/wsrep_mysqld.cc | |
| parent | 6801f80aface011811d2978f86c03a25ca7b9165 (diff) | |
| parent | 9c72963d2aef783cae652b5b8ac01f7aa2bcb43a (diff) | |
| download | mariadb-git-ec40980ddd921a3a765c23cc430c9c219e48ea85.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index bc0c1ab20e3..1ac5b39ff29 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -1703,26 +1703,6 @@ static bool wsrep_can_run_in_toi(THD *thd, const char *db, const char *table, } } -#if UNUSED /* 323f269d4099 (Jan Lindström 2018-07-19) */ -static const char* wsrep_get_query_or_msg(const THD* thd) -{ - switch(thd->lex->sql_command) - { - case SQLCOM_CREATE_USER: - return "CREATE USER"; - case SQLCOM_GRANT: - return "GRANT"; - case SQLCOM_REVOKE: - return "REVOKE"; - case SQLCOM_SET_OPTION: - if (thd->lex->definer) - return "SET PASSWORD"; - /* fallthrough */ - default: - return thd->query(); - } -} -#endif //UNUSED static int wsrep_create_sp(THD *thd, uchar** buf, size_t* buf_len) { @@ -2659,7 +2639,7 @@ void* start_wsrep_THD(void *arg) need to know the start of the stack so that we could check for stack overruns. */ - DBUG_PRINT("wsrep", ("handle_one_connection called by thread %lld\n", + DBUG_PRINT("wsrep", ("handle_one_connection called by thread %lld", (long long)thd->thread_id)); /* now that we've called my_thread_init(), it is safe to call DBUG_* */ |