diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-10-30 19:04:54 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-11-12 09:27:41 +0100 |
commit | 68889c8dfa4a1f580a611c174d0ef807cb87bbad (patch) | |
tree | 39d12de3916d77fbb8878c04e15a4e5c3f18ea21 /sql/sql_class.h | |
parent | 89ac4b3bf82aee9cd6bde87e0fe2c5f7ad87154b (diff) | |
download | mariadb-git-bb-10.4-ps.tar.gz |
Make mysqltest to use --ps-protocol morebb-10.4-ps
use prepared statements for everything that server supports
with the exception of CALL (for now).
Fix discovered test failures and bugs.
tests:
* PROCESSLIST shows Execute state, not Query
* SHOW STATUS increments status variables more than in text protocol
* multi-statements should be avoided (see tests with a wrong delimiter)
* performance_schema events have different names in --ps-protocol
mysqltest.cc:
* make sure run_query_stmt() doesn't crash if there's
no active connection (in wait_until_connected_again.inc)
sql_acl.cc:
* extract the functionality of getting the user for SHOW GRANTS
from check_show_access(), so that mysql_test_show_grants() could
generate the correct column names in the prepare step
sql_class.cc:
* result->prepare() can fail, don't ignore its return value
* use the correct metadata when creating a column for ANALYZE SELECT.
The actual value is always FLOAT(4,2), but the column was created
as FLOAT(4,10), so --ps and text protocols were using different number
of decimals.
sql_parse.cc:
* discard profiling for SHOW PROFILE. In text protocol it's done in
prepare_schema_table(), but in --ps it is called on prepare only,
so nothing was discarding profiling during execute.
* move the permission checking code for SHOW CREATE VIEW to
mysqld_show_create_get_fields(), so that it would be called during
prepare step too.
* only set sel_result when it was created here and needs to be
destroyed in the same block. Avoid destroying lex->result.
* use the correct number of tables in check_show_access(). Saying
"as many as possible" doesn't work when first_not_own_table isn't
set yet.
sql_prepare.cc:
* use correct user name for SHOW GRANTS columns
* don't ignore verbose flag for SHOW SLAVE STATUS
* support preparing REVOKE ALL and ROLLBACK TO SAVEPOINT
* don't ignore errors from thd->prepare_explain_fields()
sql_show.cc:
* check grants for SHOW CREATE VIEW here, not in mysql_execute_command
sql_tvc.cc:
* allocate Type_holder and items in the correct arena
sql_view.cc:
* use the correct function to check privileges. Old code was doing
check_access() for thd->security_ctx, which is invoker's sctx,
not definer's sctx. Hide various view related errors from the invoker.
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 70781296d1b..c8818424853 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3792,8 +3792,8 @@ public: void add_changed_table(TABLE *table); void add_changed_table(const char *key, size_t key_length); CHANGED_TABLE_LIST * changed_table_dup(const char *key, size_t key_length); - void prepare_explain_fields(select_result *result, List<Item> *field_list, - uint8 explain_flags, bool is_analyze); + int prepare_explain_fields(select_result *result, List<Item> *field_list, + uint8 explain_flags, bool is_analyze); int send_explain_fields(select_result *result, uint8 explain_flags, bool is_analyze); void make_explain_field_list(List<Item> &field_list, uint8 explain_flags, |