From 1d17fd7d51f7100038eaa5fb4cb372c785a44010 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 12 Oct 2003 17:56:05 +0300 Subject: fixed printability of Items (all items except subselects) (SCRUM) (WL#1274) sql/item.cc: fixed printability of Items sql/item.h: fixed printability of Items sql/item_cmpfunc.cc: fixed printability of Items sql/item_cmpfunc.h: fixed printability of Items sql/item_func.cc: fixed printability of Items sql/item_func.h: fixed printability of Items sql/item_geofunc.h: added DBUG_ASSERT to catch error in debuging timw sql/item_row.cc: fixed printability of Items sql/item_row.h: fixed printability of Items sql/item_strfunc.cc: fixed printability of Items sql/item_strfunc.h: fixed printability of Items sql/item_sum.cc: fixed printability of Items sql/item_sum.h: fixed printability of Items sql/item_timefunc.cc: fixed printability of Items sql/item_timefunc.h: layout fixed fixed printability of Items sql/item_uniq.h: fixed printability of Items sql/sql_yacc.yy: layout fixed correct convertion to String --- sql/item_cmpfunc.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'sql/item_cmpfunc.h') diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 42b73c48606..ab03782b168 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -105,7 +105,7 @@ public: Item_in_optimizer return NULL, else it evaluate Item_in_subselect. */ longlong val_int(); - const char *func_name() const { return "IN_OPTIMIZER"; } + const char *func_name() const { return ""; } Item_cache **get_cache() { return &cache; } }; @@ -262,6 +262,7 @@ public: enum Functype functype() const { return BETWEEN; } const char *func_name() const { return "between"; } void fix_length_and_dec(); + void print(String *str); }; @@ -704,7 +705,7 @@ public: {} enum Functype functype() const { return ISNOTNULLTEST_FUNC; } longlong val_int(); - const char *func_name() const { return "is_not_null_test"; } + const char *func_name() const { return ""; } void update_used_tables(); }; @@ -722,6 +723,7 @@ public: const char *func_name() const { return "isnotnull"; } optimize_type select_optimize() const { return OPTIMIZE_NULL; } table_map not_null_tables() const { return 0; } + void print(String *str); }; @@ -775,6 +777,7 @@ public: longlong val_int(); bool fix_fields(THD *thd, struct st_table_list *tlist, Item **ref); const char *func_name() const { return "regex"; } + void print(String *str) { print_op(str); } }; #else @@ -785,6 +788,7 @@ public: Item_func_regex(Item *a,Item *b) :Item_bool_func(a,b) {} longlong val_int() { return 0;} const char *func_name() const { return "regex"; } + void print(String *str) { print_op(str); } }; #endif /* USE_REGEX */ -- cgit v1.2.1 From 724a6c3c6d09891f07352bbc4b041ec960fc8986 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 16 Oct 2003 15:54:47 +0300 Subject: subqueries made printable new EXPLAIN parameter to show real query as it was interpreted (SCRUM) (WL#1274) mysql-test/r/subselect.result: new explains mysql-test/r/union.result: new explains mysql-test/t/subselect.test: new explains mysql-test/t/union.test: new explains sql/item.cc: fixed printability of Items in SELECT list sql/item.h: fixed printability of Items in SELECT list sql/item_cmpfunc.cc: fixed print() sql/item_cmpfunc.h: fixed print() sql/item_subselect.cc: subqueries made printable sql/item_subselect.h: subqueries made printable sql/mysql_priv.h: union option made looks like options sql/sql_derived.cc: now this link is used sql/sql_lex.cc: subqueries made printable sql/sql_lex.h: subqueries made printable new EXPLAIN parameter support sql/sql_parse.cc: new EXPLAIN parameter sql/sql_select.cc: debug output new EXPLAIN parameter support sql/sql_select.h: new EXPLAIN parameter support sql/sql_yacc.yy: new EXPLAIN parameter support SELECT printability support --- sql/item_cmpfunc.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sql/item_cmpfunc.h') diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index ab03782b168..eb473a1a73d 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -160,10 +160,14 @@ class Item_func_not_all :public Item_func_not { bool abort_on_null; public: - Item_func_not_all(Item *a) :Item_func_not(a), abort_on_null(0) {} + bool show; + + Item_func_not_all(Item *a) :Item_func_not(a), abort_on_null(0), show(0) {} virtual void top_level_item() { abort_on_null= 1; } bool top_level() { return abort_on_null; } longlong val_int(); + const char *func_name() const { return ""; } + void print(String *str); }; class Item_func_eq :public Item_bool_rowready_func2 -- cgit v1.2.1 From 87e6c2ba77a514456f9f33e69984d67d0a588469 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 30 Oct 2003 12:57:26 +0200 Subject: added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor() added string length for more speed made code covarage for print() method of Item fixed printability of some items (SCRUM) (WL#1274) mysql-test/r/auto_increment.result: print() code coverage mysql-test/r/bench_count_distinct.result: print() code coverage mysql-test/r/case.result: print() code coverage mysql-test/r/cast.result: print() code coverage mysql-test/r/ctype_collate.result: print() code coverage mysql-test/r/ctype_many.result: convert with 3 arguments code covarage print() code coverage mysql-test/r/ctype_utf8.result: char_length code coverage mysql-test/r/date_formats.result: print() code coverage mysql-test/r/fulltext.result: print() code coverage mysql-test/r/func_compress.result: print() code coverage mysql-test/r/func_gconcat.result: print() code coverage mysql-test/r/func_group.result: bit_xor() code coverage print() code coverage mysql-test/r/func_if.result: nullif() code coverage print() code coverage mysql-test/r/func_in.result: print() code coverage mysql-test/r/func_math.result: print() code coverage mysql-test/r/func_op.result: print() code coverage mysql-test/r/func_regexp.result: print() code coverage mysql-test/r/func_set.result: print() code coverage mysql-test/r/func_str.result: crc32() code coverage print() code coverage mysql-test/r/func_system.result: print() code coverage mysql-test/r/func_test.result: print() code coverage mysql-test/r/func_time.result: print() code coverage mysql-test/r/group_by.result: print() code coverage mysql-test/r/having.result: print() code coverage mysql-test/r/insert_update.result: print() code coverage mysql-test/r/null.result: print() code coverage mysql-test/r/olap.result: print() code coverage mysql-test/r/query_cache.result: print() code coverage mysql-test/r/row.result: print() code coverage mysql-test/r/rpl000001.result: print() code coverage mysql-test/r/rpl_get_lock.result: print() code coverage mysql-test/r/rpl_master_pos_wait.result: print() code coverage mysql-test/r/select.result: print() code coverage mysql-test/r/subselect.result: print() code coverage mysql-test/r/type_blob.result: print() code coverage mysql-test/r/varbinary.result: print() code coverage mysql-test/r/variables.result: print() code coverage mysql-test/t/auto_increment.test: print() code coverage mysql-test/t/bench_count_distinct.test: print() code coverage mysql-test/t/case.test: print() code coverage mysql-test/t/cast.test: print() code coverage mysql-test/t/ctype_collate.test: print() code coverage mysql-test/t/ctype_many.test: convert with 3 arguments code covarage print() code coverage mysql-test/t/ctype_utf8.test: char_length code coverage mysql-test/t/date_formats.test: print() code coverage mysql-test/t/fulltext.test: print() code coverage mysql-test/t/func_compress.test: print() code coverage mysql-test/t/func_gconcat.test: print() code coverage mysql-test/t/func_group.test: bit_xor() code coverage print() code coverage mysql-test/t/func_if.test: nullif() code coverage print() code coverage mysql-test/t/func_in.test: print() code coverage mysql-test/t/func_math.test: print() code coverage mysql-test/t/func_op.test: print() code coverage mysql-test/t/func_regexp.test: print() code coverage mysql-test/t/func_set.test: print() code coverage mysql-test/t/func_str.test: crc32() code covarage print() code coverage mysql-test/t/func_system.test: print() code coverage mysql-test/t/func_test.test: print() code coverage mysql-test/t/func_time.test: print() code coverage mysql-test/t/group_by.test: print() code coverage mysql-test/t/having.test: print() code coverage mysql-test/t/insert_update.test: print() code coverage mysql-test/t/null.test: print() code coverage mysql-test/t/olap.test: print() code coverage mysql-test/t/query_cache.test: print() code coverage mysql-test/t/row.test: print() code coverage mysql-test/t/rpl000001.test: print() code coverage mysql-test/t/rpl_get_lock.test: print() code coverage mysql-test/t/rpl_master_pos_wait.test: print() code coverage mysql-test/t/select.test: print() code coverage mysql-test/t/type_blob.test: print() code coverage mysql-test/t/varbinary.test: print() code coverage mysql-test/t/variables.test: print() code coverage sql/item.cc: added string length for more speed layout fix fixed string printability sql/item.h: added string length for more speed sql/item_cmpfunc.cc: added string length for more speed sql/item_cmpfunc.h: fixed printability sql/item_create.cc: fixed printability sql/item_func.cc: fixed printability added string length for more speed sql/item_func.h: fixed printability sql/item_strfunc.cc: fixed printability added string length for more speed sql/item_strfunc.h: fixed printability sql/item_subselect.cc: added string length for more speed sql/item_sum.cc: added string length for more speed sql/item_timefunc.cc: added string length for more speed sql/item_timefunc.h: fixed printability sql/item_uniq.h: added string length for more speed sql/key.cc: added string length for more speed sql/sql_lex.cc: added string length for more speed sql/sql_parse.cc: after merge fix sql/sql_repl.cc: string changed with character for more speed sql/sql_select.cc: added string length for more speed sql/sql_show.cc: added string length for more speed --- sql/item_cmpfunc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/item_cmpfunc.h') diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index eb473a1a73d..36ed849a650 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -349,6 +349,7 @@ public: enum Item_result result_type () const { return cached_result_type; } void fix_length_and_dec(); const char *func_name() const { return "nullif"; } + void print(String *str) { Item_func::print(str); } table_map not_null_tables() const { return 0; } }; @@ -780,7 +781,7 @@ public: ~Item_func_regex(); longlong val_int(); bool fix_fields(THD *thd, struct st_table_list *tlist, Item **ref); - const char *func_name() const { return "regex"; } + const char *func_name() const { return "regexp"; } void print(String *str) { print_op(str); } }; -- cgit v1.2.1