diff options
| author | unknown <monty@mysql.com> | 2006-05-03 19:40:52 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-05-03 19:40:52 +0300 |
| commit | 3c099551d09b2e2a5a19b0428226d32bd5fe68d7 (patch) | |
| tree | 56dea2b9467ce7416907481cc2f3c6415d2d8256 /sql/sql_class.h | |
| parent | 8e2650ab3d97791db40d6dc5630bc89f343ffa09 (diff) | |
| download | mariadb-git-3c099551d09b2e2a5a19b0428226d32bd5fe68d7.tar.gz | |
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
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 937457abc64..54f256997d0 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -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) */ |