mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Cleanups after review of WL#602
Fixed warnings from test suite Some fixes in mysql-test-run script to catch more warnings mysql-test/lib/mtr_report.pl: Catch more warnings mysql-test/mysql-test-run.sh: Catch warnings from mysqld mysql-test/t/mysqldump.test: Add key_block_size to catch future changes in information schema mysys/errors.c: Ensure that mysql-test-run catches if we call my_close() too many times sql/handler.cc: Initialize all elements sql/log.cc: true -> TRUE sql/sql_class.h: Review change: key_info -> key_create_info sql/sql_lex.h: Review change: key_info -> key_create_info sql/sql_table.cc: Review change: key_info -> key_create_info Don't call mysql_close() if init_ddl_log is not called. Better error handling in init_ddl_log sql/sql_yacc.yy: Review change: key_info -> key_create_info
This commit is contained in:
@@ -112,7 +112,7 @@ class Key :public Sql_alloc {
|
||||
public:
|
||||
enum Keytype { PRIMARY, UNIQUE, MULTIPLE, FULLTEXT, SPATIAL, FOREIGN_KEY};
|
||||
enum Keytype type;
|
||||
KEY_CREATE_INFO key_info;
|
||||
KEY_CREATE_INFO key_create_info;
|
||||
List<key_part_spec> columns;
|
||||
const char *name;
|
||||
bool generated;
|
||||
@@ -120,8 +120,8 @@ public:
|
||||
Key(enum Keytype type_par, const char *name_arg,
|
||||
KEY_CREATE_INFO *key_info_arg,
|
||||
bool generated_arg, List<key_part_spec> &cols)
|
||||
:type(type_par), key_info(*key_info_arg), columns(cols), name(name_arg),
|
||||
generated(generated_arg)
|
||||
:type(type_par), key_create_info(*key_info_arg), columns(cols),
|
||||
name(name_arg), generated(generated_arg)
|
||||
{}
|
||||
~Key() {}
|
||||
/* Equality comparison of keys (ignoring name) */
|
||||
|
||||
Reference in New Issue
Block a user