You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

107 lines
3.1 KiB

Updated documentation files to reflect MariaDB and not the Maria storage engine or MySQL Added (rewritten) patch from Percona to get extended statistics in slow.log: - Added handling of 'set' variables to set_var.cc. Changed sql_mode to use this - Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined' - Added optional logging to slow log, through log_slow_verbosity, of query plan statistics - Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter - Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow' - Added log-slow-time as synonym for long-query-time Some trivial MyISAM optimizations: - In prepare for drop, flush key blocks - Don't call mi_lock_database if my_disable_locking is used KNOWN_BUGS.txt: Updated file to reflect MariaDB and not the Maria storage engine README: Updated file to reflect MariaDB mysql-test/r/log_slow.result: Test new options for slow query log mysql-test/r/variables.result: Updated result (old version cut of things at 79 characters) mysql-test/t/log_slow.test: Test new options for slow query log sql/Makefile.am: Added log_slow.h sql/event_data_objects.cc: Removed not needed test for enable_slow_log (is done when the flag is tested elsewhere) sql/events.cc: Use the general make_set() function instead of 'symbolic_mode_representation' sql/filesort.cc: Added status for used query plans sql/log.cc: Reset counters if no query_length (from Percona's patch; Not sure if needed, but can do no harm) Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined' Added optional logging to slow log, through log_slow_verbosity, of query plan statistics Fixed wrong test of error condition sql/log_slow.h: Defines and variables for log_slow_verbosity and log_slow_filter sql/mysql_priv.h: Include log_slow.h sql/mysqld.cc: Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow' Added log-slow-time as synonym for long-query-time Added note that one should use log-slow-filter instead of log-slow-admin-statements Updated comment from 'slow_query_log_file' sql/set_var.cc: Added long_slow_time as synonym for long_query_time Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter dded handling of 'set' variables to set_var.cc. Changed sql_mode to use this sql/set_var.h: - Added handling of 'set' variables. Changed sql_mode to use this sql/slave.cc: Use global filter also for slaves sql/sp_head.cc: Simplify saving of general_slow_log state Use the general make_set() function instead of 'symbolic_mode_representation' sql/sql_cache.cc: Added status for used query plans sql/sql_class.cc: Remember/restore query_plan_flags over complex statements sql/sql_class.h: Added variables to handle extended slow log statistics sql/sql_parse.cc: Added status for used query plans Added test for filtering slow_query_log sql/sql_select.cc: Added status for used query plans sql/sql_show.cc: Use the general make_set() function instead of 'symbolic_mode_representation' sql/strfunc.cc: Report first error (not last) if something is wrong in a set Removed compiler warning storage/myisam/mi_extra.c: In prepare for drop, flush key blocks (speed optimization) storage/myisam/mi_locking.c: Don't call mi_lock_database if my_disable_locking is used (speed optimization)
17 years ago
  1. /* Copyright (C) 2009 Monty Program Ab
  2. This program is free software; you can redistribute it and/or modify
  3. it under the terms of the GNU General Public License as published by
  4. the Free Software Foundation; version 2 or later of the License.
  5. This program is distributed in the hope that it will be useful,
  6. but WITHOUT ANY WARRANTY; without even the implied warranty of
  7. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  8. GNU General Public License for more details.
  9. You should have received a copy of the GNU General Public License
  10. along with this program; if not, write to the Free Software
  11. Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
  12. /* Defining what to log to slow log */
  13. #define LOG_SLOW_VERBOSITY_INIT 0
  14. #define LOG_SLOW_VERBOSITY_INNODB 1 << 0
  15. #define LOG_SLOW_VERBOSITY_QUERY_PLAN 1 << 1
  16. #ifdef DEFINE_VARIABLES_LOG_SLOW
  17. /* Names here must be in same order as the bit's above */
  18. static const char *log_slow_verbosity_names[]=
  19. {
  20. "innodb","query_plan",
  21. NullS
  22. };
  23. static const unsigned int log_slow_verbosity_names_len[]=
  24. {
  25. sizeof("innodb") -1,
  26. sizeof("query_plan")-1
  27. };
  28. TYPELIB log_slow_verbosity_typelib=
  29. { array_elements(log_slow_verbosity_names)-1,"", log_slow_verbosity_names,
  30. (unsigned int *) log_slow_verbosity_names_len };
  31. #else
  32. extern TYPELIB log_slow_verbosity_typelib;
  33. #endif /* DEFINE_VARIABLES_LOG_SLOW */
  34. /* Defines for what kind of query plan was used and what to log */
  35. /*
  36. We init the used query plan with a bit that is alwyas set and all 'no' bits
  37. to enable easy testing of what to log in sql_log.cc
  38. */
  39. #define QPLAN_INIT (QPLAN_ALWAYS_SET | QPLAN_QC_NO)
  40. #define QPLAN_ADMIN 1 << 0
  41. #define QPLAN_FILESORT 1 << 1
  42. #define QPLAN_FILESORT_DISK 1 << 2
  43. #define QPLAN_FULL_JOIN 1 << 3
  44. #define QPLAN_FULL_SCAN 1 << 4
  45. #define QPLAN_QC 1 << 5
  46. #define QPLAN_QC_NO 1 << 6
  47. #define QPLAN_TMP_DISK 1 << 7
  48. #define QPLAN_TMP_TABLE 1 << 8
  49. /* ... */
  50. #define QPLAN_MAX ((ulong) 1) << 31 /* reserved as placeholder */
  51. #define QPLAN_ALWAYS_SET QPLAN_MAX
  52. #define QPLAN_VISIBLE_MASK (~(QPLAN_ALWAYS_SET))
  53. #ifdef DEFINE_VARIABLES_LOG_SLOW
  54. /* Names here must be in same order as the bit's above */
  55. static const char *log_slow_filter_names[]=
  56. {
  57. "admin",
  58. "filesort",
  59. "filesort_on_disk",
  60. "full_join",
  61. "full_scan",
  62. "query_cache",
  63. "query_cache_miss",
  64. "tmp_table",
  65. "tmp_table_on_disk",
  66. NullS
  67. };
  68. static const unsigned int log_slow_filter_names_len[]=
  69. {
  70. sizeof("admin")-1,
  71. sizeof("filesort")-1,
  72. sizeof("filesort_on_disk")-1,
  73. sizeof("full_join")-1,
  74. sizeof("full_scan")-1,
  75. sizeof("query_cache")-1,
  76. sizeof("query_cache_miss")-1,
  77. sizeof("tmp_table")-1,
  78. sizeof("tmp_table_on_disk")-1
  79. };
  80. TYPELIB log_slow_filter_typelib=
  81. { array_elements(log_slow_filter_names)-1,"", log_slow_filter_names,
  82. (unsigned int *) log_slow_filter_names_len };
  83. #else
  84. extern TYPELIB log_slow_filter_typelib;
  85. #endif /* DEFINE_VARIABLES_LOG_SLOW */
  86. static inline ulong fix_log_slow_filter(ulong org_filter)
  87. {
  88. return org_filter ? org_filter : QPLAN_ALWAYS_SET;
  89. }