1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-20 10:24:14 +03:00
Commit Graph

46 Commits

Author SHA1 Message Date
cb248f8806 Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
5543b75550 Update FSF Address
* Update wrong zip-code
2019-05-11 21:29:06 +03:00
7ad355dde7 MDEV-18934: Document missing mysqldumpslow sort options 2019-03-15 13:58:39 +04:00
8e8d42ddf0 Merge branch '10.0' into 10.1 2017-08-08 10:18:43 +02:00
9a5fe1f4ea Merge remote-tracking branch 'mysql/5.5' into 5.5 2017-07-18 14:59:10 +02:00
5d4cfb30e5 BUG#25719975 SHEBANG HARD CODED AS /USR/BIN/PERL IN SCRIPTS, BREAKS ON FREEBSD
Use cmake variable to adjust shebang to platform.
2017-03-28 13:22:32 +02:00
2b40a389a5 MDEV-4412 : SLOW QUERY LOG - add affected rows (UPDATE / DELETE) in slow query log
Added Rows_affected to slow query log & mysql.slow_log table.
2014-11-30 21:13:41 -05:00
3bfd88d1d6 MDEV-4068 rpm scriptlet chown command dangerous
add --mysqld option to my_print_defaults
change server-postin script to use that
2013-03-06 09:32:13 +01:00
0e007344ea mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
68f00a5686 Updated/added copyright headers 2011-06-30 17:37:13 +02:00
44135d4725 Updated/added copyright headers 2011-06-30 17:31:31 +02:00
1400d7a2cc Updated/added copyright headers 2011-06-30 17:37:13 +02:00
e5ce023f57 Updated/added copyright headers 2011-06-30 17:31:31 +02:00
0fae0335d4 Ensure that all clients reads the appropriate 'client', client-mariadb and 'mariadb' sections from my.cnf
The mysqld server and all clients now reads the new client-server section
Fixed that mysqldumpslow supports new slow log formats and new mysqld --slow- options


client/mysql.cc:
  Read also client-server and client-mariadb sections.
client/mysql_upgrade.c:
  Read also client-server and client-mariadb sections.
client/mysqladmin.cc:
  Read also client-server and client-mariadb sections.
client/mysqlbinlog.cc:
  Read also client-server and client-mariadb sections.
client/mysqlcheck.c:
  Read also client-server and client-mariadb sections.
client/mysqldump.c:
  Read also client-server and client-mariadb sections.
client/mysqlimport.c:
  Read also client-server and client-mariadb sections.
client/mysqlshow.c:
  Read also client-server and client-mariadb sections.
client/mysqltest.cc:
  Read also client-server and client-mariadb sections.
extra/my_print_defaults.c:
  Updated help text
scripts/mysql_fix_privilege_tables.sh:
  Read also sections client client-server client-mariadb
scripts/mysql_install_db.pl.in:
  Also allow --data=* option
  Read also groups mariadb, server and client-server.
scripts/mysql_install_db.sh:
  Also allow --data=* option
  Read also groups mariadb, server and client-server.
  Added --lose-skip-pbxt to bootstrap
scripts/mysql_secure_installation.sh:
  Read also groups client-server and client-mariadb
scripts/mysqld_multi.sh:
  Read also group mariadb
scripts/mysqld_safe.sh:
  Read also groups mariadb server and client-server
scripts/mysqldumpslow.sh:
  Fixed to support new slow log formats
  Added sorting on -ae (aggregated number of retreived rows) and e (retrieved rows)
  Read also group 'mariadb'
  If there is many instances of same option, use last one.
  Get slow log file from options log-slow-queries=filename or query-log-file=filename
  Added support for future --log-basename option
sql-common/client.c:
  Read also groups 'client-server' and 'client-mariadb'
tests/mysql_client_test.c:
  Read also groups 'client-server' and 'client-mariadb'
tests/thread_test.c:
  Read also groups 'client-server' and 'client-mariadb'
2011-03-18 17:03:43 +02:00
4acfdb9df1 Merge 2010-12-29 00:47:05 +01:00
920d185fd8 Merge 2010-12-29 00:47:05 +01:00
85323eda8a - Added/updated copyright headers
- Removed files specific to compiling on OS/2
- Removed files specific to SCO Unix packaging
- Removed "libmysqld/copyright", text is included in documentation
- Removed LaTeX headers for NDB Doxygen documentation
- Removed obsolete NDB files
- Removed "mkisofs" binaries
- Removed the "cvs2cl.pl" script
- Changed a few GPL texts to use "program" instead of "library"
2010-12-28 19:57:23 +01:00
fddb1f1b13 - Added/updated copyright headers
- Removed files specific to compiling on OS/2
- Removed files specific to SCO Unix packaging
- Removed "libmysqld/copyright", text is included in documentation
- Removed LaTeX headers for NDB Doxygen documentation
- Removed obsolete NDB files
- Removed "mkisofs" binaries
- Removed the "cvs2cl.pl" script
- Changed a few GPL texts to use "program" instead of "library"
2010-12-28 19:57:23 +01:00
b78f9a8659 Add explanation of the possible -s values for mysqldumpslow. (Bug #35663,
based on a contribution by Ask Bjørn Hansen)
2009-05-07 10:40:00 -07:00
5b66e5fe4b Add explanation of the possible -s values for mysqldumpslow. (Bug #35663,
based on a contribution by Ask Bjørn Hansen)
2009-05-07 10:40:00 -07:00
137ec698ff Update list of sorting options in mysqldumpslow (Bug #20454) 2009-04-28 11:19:58 -07:00
46b6246dee Update list of sorting options in mysqldumpslow (Bug #20454) 2009-04-28 11:19:58 -07:00
565660edfa automerge 2009-02-24 09:07:40 +01:00
963167e0ff automerge 2009-02-24 09:07:40 +01:00
ec8de22f9f Bug#42027: Incorrect parsing of debug and verbose options for mysqldumpslow
Options got normalised to long rather than short options
since we gave primary name and alias in wrong order.
Consequently querying for the option using the short
options (the correct primary name) didn't work, rendering
the options in question inaccessible.

We restore the right order of the universe, or at least
the alii for --debug and --verbose.

scripts/mysqldumpslow.sh:
  Normalise --verbose/-v and --debug/-d to short
  options, not long options.
2009-02-16 15:38:18 +01:00
a3ad5089cb Bug#42027: Incorrect parsing of debug and verbose options for mysqldumpslow
Options got normalised to long rather than short options
since we gave primary name and alias in wrong order.
Consequently querying for the option using the short
options (the correct primary name) didn't work, rendering
the options in question inaccessible.

We restore the right order of the universe, or at least
the alii for --debug and --verbose.
2009-02-16 15:38:18 +01:00
77fec0b219 In mysqldumpslow, consume arbitrary whitespace in the Query_time line. 2008-10-14 15:52:52 -04:00
628a7dd2bc In mysqldumpslow, consume arbitrary whitespace in the Query_time line. 2008-10-14 15:52:52 -04:00
c7866ece4d Bug#34129: mysqldumpslow does not aggregate times
Query times were changed to contain subsecond information after a decimal.

Change the capturing regex to account for decimal also.
2008-07-07 18:56:53 -04:00
7423d499ed Bug#34129: mysqldumpslow does not aggregate times
Query times were changed to contain subsecond information after a decimal.

Change the capturing regex to account for decimal also.
2008-07-07 18:56:53 -04:00
471437fd47 make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:
Better Windows support in the scripts directory
mysql_config.pl.in, mysql_install_db.pl.in:
  New Perl version of Unix shell script, mainly for Windows
Many files in scripts directory:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path


extra/CMakeLists.txt:
  Added target for executable "resolveip"
extra/resolveip.c:
  Exclude Unix specific headers when compiling on Windows
scripts/CMakeLists.txt:
  On Windows, filter Perl scripts and change name from ".sh" to ".pl"
  
    mysql_convert_table_format.sh  mysql_explain_log.sh
    mysql_secure_installation.sh   mysql_tableinfo.sh
    mysqld_multi.sh                mysqldumpslow.sh
    mysqlhotcopy.sh
  
  Do the same for the new Windows specific Perl versions of shell scripts
  
    mysql_config.pl.in             mysql_install_db.pl.in
  
  In CMake, set reasonable values for 'CFLAGS', 'prefix', 'datadir' and so on.
scripts/Makefile.am:
  Include "mysql_config.pl.in" and "mysql_install_db.pl.in" in the source TAR
scripts/make_win_bin_dist:
  Only include explicitly listed scripts from the "scripts" directory
scripts/mysql_convert_table_format.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysql_explain_log.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysql_tableinfo.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysqld_multi.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysqldumpslow.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysqlhotcopy.sh:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysql_config.pl.in:
  New Perl version of Unix shell script, mainly for Windows
scripts/mysql_install_db.pl.in:
  New Perl version of Unix shell script, mainly for Windows
2007-12-28 01:02:28 +01:00
18418ff8c5 make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:
Better Windows support in the scripts directory
mysql_config.pl.in, mysql_install_db.pl.in:
  New Perl version of Unix shell script, mainly for Windows
Many files in scripts directory:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
2007-12-28 01:02:28 +01:00
76daa59fc8 Search through options to find where the slow query log actually is. 2006-12-18 21:12:01 -08:00
09591de344 Search through options to find where the slow query log actually is. 2006-12-18 21:12:01 -08:00
914afabd39 mysqldumpslow.sh:
bug#4914 added --help and usage information


scripts/mysqldumpslow.sh:
  bug#4914 added --help and usage information
2005-03-09 15:00:40 +01:00
3ce3295e3f mysqldumpslow.sh:
bug#4914 added --help and usage information
2005-03-09 15:00:40 +01:00
6e37987c51 Fixed mysqldumpslow for new dump format.
Fix for HEAP tables with many rows deleted.
Add '' arround database names in SHOW GRANT


Docs/manual.texi:
  Fixed symlink examples.
heap/hp_rfirst.c:
  Remove not needed patch.
mysql-test/r/heap.result:
  Added test case for HEAP + many deletes
mysql-test/t/heap.test:
  Added test case for HEAP + many deletes
mysys/mf_loadpath.c:
  Resolve path's even if they don't end in '/'
scripts/mysqldumpslow.sh:
  Fix for new dump format.
sql/handler.cc:
  Fix for HEAP tables with many rows deleted.
sql/sql_acl.cc:
  Add '' arround database names in SHOW GRANT
2002-03-12 11:52:41 +02:00
8eadb024dc Fixed mysqldumpslow for new dump format.
Fix for HEAP tables with many rows deleted.
Add '' arround database names in SHOW GRANT
2002-03-12 11:52:41 +02:00
49a3cea4e0 Fixed handling of strings in mysqldumpslow
scripts/mysqldumpslow.sh:
  Handling of strings with \ and double ''
sql/mysqlbinlog.cc:
  Fixed type
2001-08-11 01:42:34 +03:00
79131084c8 Fixed handling of strings in mysqldumpslow 2001-08-11 01:42:34 +03:00
740465fc5b Fixed bug in INSERT DELAYED when INSERT generated an error
Docs/manual.texi:
  Splitted INSERT syntax to different sub-sections
mysql-test/r/delayed.result:
  Added new test that hanged INSERT DELAYED
mysql-test/t/delayed.test:
  Added new test that hanged INSERT DELAYED
scripts/mysqldumpslow.sh:
  Fix for new slow query log format
sql/field_conv.cc:
  cleanup
2001-03-08 21:49:15 +02:00
32d403f087 Fixed bug in INSERT DELAYED when INSERT generated an error 2001-03-08 21:49:15 +02:00
776bd0e418 mysqldump.c typo fixed
mysqldumpslow.sh   | first line should be #!@PERL@
mysqld_multi.sh    | not #@perl@ or #!/usr/bin/perl


client/mysqldump.c:
  typo fixed
2000-12-08 19:12:12 +01:00
9de654911f mysqldump.c typo fixed
mysqldumpslow.sh   | first line should be #!@PERL@
mysqld_multi.sh    | not #@perl@ or #!/usr/bin/perl
2000-12-08 19:12:12 +01:00
0c993b72d1 mysqldumpslow.sh BitKeeper file /my/bk/mysql/scripts/mysqldumpslow.sh 2000-11-21 18:28:46 +02:00
174047268a mysqldumpslow.sh BitKeeper file /my/bk/mysql/scripts/mysqldumpslow.sh 2000-11-21 18:28:46 +02:00