summaryrefslogtreecommitdiff
path: root/client/mysql_upgrade.c
Commit message (Collapse)AuthorAgeFilesLines
* Fix for Bug#57094 (Copyright notice incorrect?).Alexander Nozdrin2010-10-061-1/+4
| | | | | | | The fix is to: - introduce ORACLE_WELCOME_COPYRIGHT_NOTICE define to have a single place to specify copyright notice; - replace custom copyright notices with ORACLE_WELCOME_COPYRIGHT_NOTICE in programs.
* fix for Bug #55672 "mysql_upgrade dies with internal error":Guilhem Bichot2010-08-111-0/+3
| | | it couldn't parse the --ssl option.
* Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-1/+4
|\
| * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-1/+4
| | | | | | | | | | | | Fix warnings flagged by the new warning option -Wunused-but-set-variable that was added to GCC 4.6 and that is enabled by -Wunused and -Wall. The option causes a warning whenever a local variable is assigned to but is later unused. It also warns about meaningless pointer dereferences.
* | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-7/+0
| | | | | | Remove Netware specific code.
* | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-101-13/+13
|\ \ | |/
| * Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strict aliasing violations. Essentially, the problem is that large parts of the server were developed in simpler times (last decades, pre C99 standard) when strict aliasing and compilers supporting such optimizations were rare to non-existent. Thus, when compiling the server with a modern compiler that uses strict aliasing rules to perform optimizations, there are several places in the code that might trigger undefined behavior. As evinced by some recent bugs, GCC does a somewhat good of job misoptimizing such code, but on the other hand also gives warnings about suspicious code. One problem is that the warnings aren't always accurate, yet we can't afford to just shut them off as we might miss real cases. False-positive cases are aggravated mostly by casts that are likely to trigger undefined behavior. The solution is to start a cleanup process focused on fixing and reducing the amount of strict-aliasing related warnings produced by GCC and others compilers. A good deal of noise reduction can be achieved by just removing useless casts that are product of historical cruft and are likely to trigger undefined behavior if dereferenced.
* | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in client/mysqlbinlog.cc Text conflict in mysql-test/Makefile.am Text conflict in mysql-test/collections/default.daily Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test Text conflict in mysys/charset.c Text conflict in sql/field.cc Text conflict in sql/field.h Text conflict in sql/item.h Text conflict in sql/item_func.cc Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysqld.cc Text conflict in sql/rpl_utility.cc Text conflict in sql/rpl_utility.h Text conflict in sql/set_var.cc Text conflict in sql/share/Makefile.am Text conflict in sql/sql_delete.cc Text conflict in sql/sql_plugin.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_table.cc Text conflict in storage/example/ha_example.h Text conflict in storage/federated/ha_federated.cc Text conflict in storage/myisammrg/ha_myisammrg.cc Text conflict in storage/myisammrg/myrg_open.c
| * \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-11/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - client/mysql.cc - client/mysqldump.c - configure.in - mysql-test/r/csv.result - mysql-test/r/func_time.result - mysql-test/r/show_check.result - mysql-test/r/sp-error.result - mysql-test/r/sp.result - mysql-test/r/sp_trans.result - mysql-test/r/type_blob.result - mysql-test/r/type_timestamp.result - mysql-test/r/warnings.result - mysql-test/suite/rpl/r/rpl_sp.result - sql/mysql_priv.h - sql/mysqld.cc - sql/sp.cc - sql/sql_base.cc - sql/sql_table.cc - sql/sql_trigger.cc - sql/sql_view.cc - sql/table.h - sql/share/errmsg.txt - mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
| * \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - include/my_no_pthread.h - mysql-test/r/sp-ucs2.result - sql/log.cc - sql/sql_acl.cc - sql/sql_yacc.yy
| * \ \ \ merging.Alexey Botchkov2009-11-171-1/+2
| |\ \ \ \
| | * | | | Bug#47216 programs should quit if the file specified by --defaults-file ↵Alexey Botchkov2009-10-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option isn't found added code to exit a tool if the forced config file wasn't found per-file comments: client/mysql.cc Bug#47216 programs should quit if the file specified by --defaults-file option isn't found added code to exit a tool if the forced config file wasn't found client/mysql_upgrade.c Bug#47216 programs should quit if the file specified by --defaults-file option isn't found added code to exit a tool if the forced config file wasn't found client/mysqladmin.cc Bug#47216 programs should quit if the file specified by --defaults-file option isn't found added code to exit a tool if the forced config file wasn't found client/mysqlcheck.c Bug#47216 programs should quit if the file specified by --defaults-file option isn't found added code to exit a tool if the forced config file wasn't found client/mysqldump.c Bug#47216 programs should quit if the file specified by --defaults-file option isn't found added code to exit a tool if the forced config file wasn't found client/mysqlimport.c Bug#47216 programs should quit if the file specified by --defaults-file option isn't found added code to exit a tool if the forced config file wasn't found client/mysqlshow.c Bug#47216 programs should quit if the file specified by --defaults-file option isn't found added code to exit a tool if the forced config file wasn't found client/mysqlslap.c Bug#47216 programs should quit if the file specified by --defaults-file option isn't found added code to exit a tool if the forced config file wasn't found mysql-test/t/mysql.test Bug#47216 programs should quit if the file specified by --defaults-file option isn't found test added sql/mysqld.cc Bug#47216 programs should quit if the file specified by --defaults-file option isn't found added code to exit a tool if the forced config file wasn't found storage/myisam/myisamchk.c Bug#47216 programs should quit if the file specified by --defaults-file option isn't found added code to exit a tool if the forced config file wasn't found storage/myisam/myisampack.c Bug#47216 programs should quit if the file specified by --defaults-file option isn't found added code to exit a tool if the forced config file wasn't found
* | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-121-2/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in client/mysqlbinlog.cc Text conflict in mysql-test/r/explain.result Text conflict in mysql-test/r/subselect.result Text conflict in mysql-test/r/subselect3.result Text conflict in mysql-test/r/type_datetime.result Text conflict in sql/share/Makefile.am
| * | | | Bug #41057: mysql_update fails FATAL ERROR: Failed to create temporary file ↵Georgi Kodinov2010-03-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for defaults mysql_upgrade was passing an non-initialized non-null tmpdir to create_temp_file() if no --tmpdir was specified. This prevents create_temp_file() from taking the system temporary file path and as a result mysql_upgrade was trying to open a file in a directory that it may not have write access to. Fixed by making sure mysql_upgrade will pass a zero length temp dir string to create_temp_file() if no --tmpdir is specified.
* | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-02-091-11/+11
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in .bzr-mysql/default.conf Text conflict in mysql-test/suite/rpl/r/rpl_slow_query_log.result Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test Conflict adding files to server-tools. Created directory. Conflict because server-tools is not versioned, but has versioned children. Versioned directory. Conflict adding files to server-tools/instance-manager. Created directory. Conflict because server-tools/instance-manager is not versioned, but has versioned children. Versioned directory. Contents conflict in server-tools/instance-manager/options.cc Text conflict in sql/mysqld.cc
| * | | Recommit of Bug#49447.Staale Smedseng2010-02-041-11/+11
| | | |
* | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-0/+4
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | This is a patch for bug#41569.lars-erik.bjork@sun.com2009-12-031-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | "mysql_upgrade (ver 5.1) add 3 fields to mysql.proc table but does not set values". mysql_upgrade (ver 5.1) adds 3 fields (character_set_client, collation_connection and db_collation) to the mysql.proc table, but does not set any values. When we run stored procedures, which were created with mysql 5.0, a warning is logged into the error log. The solution to this is for mysql_upgrade to set default best guess values for these fields. A warning is also written during upgrade, to make the user aware that default values are set.
* | WL#4991 mysql_upgrade --fix-privilege-tablesAlexey Botchkov2009-10-281-5/+17
|/ | | | | | | | | | | | | | | | | | | (backport) mysql_upgrade script accepts --upgrade-system-tables option, fixing only system tables in this case. per-file comments: client/mysql_upgrade.c WL#4991 mysql_upgrade --fix-privilege-tables --upgrade-system-tables option added. if it is set, the tool won't look for the mysqlcheck then run_mysqlcheck_fixnames() and run_mysqlcheck_upgrade won't be called. mysql-test/r/mysql_upgrade.result WL#4991 mysql_upgrade --fix-privilege-tables test result added mysql-test/t/mysql_upgrade.test WL#4991 mysql_upgrade --fix-privilege-tables test case added
* BUG#43579 mysql_upgrade tries to alter log tables on replicated database 2009-09-281-0/+27
| | | | | | | | | All statements executed by mysql_upgrade are binlogged and then are replicated to slave. This will result in some errors. The report of this bug has demonstrated some examples. Master and slave should be upgraded separately. All statements executed by mysql_upgrade will not be binlogged. --write-binlog and --skip-write-binlog options are added into mysql_upgrade. These options control whether sql statements are binlogged or not.
* Merge from 5.0 for 43414Staale Smedseng2009-08-281-1/+2
|\
| * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with gcc 4.3.2 This patch fixes a number of GCC warnings about variables used before initialized. A new macro UNINIT_VAR() is introduced for use in the variable declaration, and LINT_INIT() usage will be gradually deprecated. (A workaround is used for g++, pending a patch for a g++ bug.) GCC warnings for unused results (attribute warn_unused_result) for a number of system calls (present at least in later Ubuntus, where the usual void cast trick doesn't work) are also fixed.
| * Bug #45287: phase 2 : 5.0 64 bit compilation warningsGeorgi Kodinov2009-07-161-1/+1
| | | | | | | | | | Fixed various compilation warnings when compiling on a 64 bit windows.
* | Merge in bug fixes for client toolsJim Winstead2009-07-141-1/+5
|\ \
| * | mysql_upgrade ignored the --basedir and --datadir arguments as it has no useJim Winstead2009-05-191-1/+5
| | | | | | | | | | | | for them, but it did so silently. (Bug #36558)
* | | Fix compilation failures: get rid of C++ specifics in C-code.Alexander Nozdrin2009-06-031-1/+1
| | |
* | | Bug #44638: mysql_upgrade, mysqlcheck output instance unclearAlexey Kopytov2009-05-271-4/+30
|/ / | | | | | | | | | | | | Dump all connection-related arguments when running mysqlcheck from mysql_upgrade. No test case, since the output depends on the test suite configuration and platform.
* | Various command-line utilities, including mysqlbinlog and mysqldump, don'tJim Winstead2009-05-071-0/+2
| | | | | | | | handle the --skip-password option correctly. (Bug #28479)
* | Make SSL options appear in correct place in mysql_upgrade and mysqltestJim Winstead2009-04-281-1/+1
| | | | | | | | usage information. (Bug #31883)
* | fixed compilation warnings. addendum to the fix for bug 29125Georgi Kodinov2009-03-201-1/+1
| |
* | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-1/+1
|\ \ | |/ | | | | | | | | - Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length
| * Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-1/+1
| | | | | | | | | | - Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length
| * Backport compiler warning fix from 5.1-bugteam.Chad MILLER2008-08-111-4/+6
| |
* | Bug#35934 mysql_upgrade calls mysqlcheck with insufficient parametersAlexey Botchkov2008-12-091-1/+14
| | | | | | | | | | | | | | | | | | | | | | modifying the original fix. As it turned out --fix-db-names option of the mysqlcheck suppress the --check_upgrade option, so we have to call the mysqlcheck twice from the mysql_upgrade. per-file comments: client/mysql_upgrade.c Bug#35934 mysql_upgrade calls mysqlcheck with insufficient parameters
* | mergingAlexey Botchkov2008-12-081-0/+2
|\ \
| * | Bug #35934 mysql_upgrade calls mysqlcheck with insufficient parameters.Alexey Botchkov2008-06-151-0/+2
| | | | | | | | | Parameters added to the mysqlcheck call to fix table/database names.
* | | Post-merge fix: Remove Remove unused variable.Davi Arnaut2008-08-111-6/+6
|\ \ \
| * | | Post-merge fix: Silence warning due to type mismatch.Davi Arnaut2008-08-111-4/+6
| | |/ | |/|
* | | merge from local 5.0 fix tree.Chad MILLER2008-08-071-83/+56
|\ \ \ | |/ / | | / | |/ |/|
| * Bug#31605: mysql_upgrade relies on Linux /proc filesystem when not \Chad MILLER2008-08-071-83/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | running on Windows We used two OS-specific methods of looking up the executable name, which don't work outside of those two kinds of OSes (Linux+Solaris and Windows). We assume that if the user ran this program with a certain name, we can run the other sibling programs with a similar name. (re-patch in bzr)
* | Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463msvensson@pilot.mysql.com2008-05-021-1/+10
|\ \ | |/ | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-bugteam
| * Bug#36469 mysql_upgrade does not use --tmpdirmsvensson@pilot.mysql.com2008-05-021-1/+10
| |
* | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-081-1/+1
|\ \ | | | | | | | | | into hynda.mysql.fi:/home/my/mysql-5.1-marvel
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2007-10-011-1/+1
| |\ \ | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| | * | Removed extra spacesmonty@mysql.com/narttu.mysql.fi2007-10-011-1/+1
| | | | | | | | | | | | | | | | Added extra debug
* | | | Merge alf.(none):/src/bug28774/my50-bug28774iggy@alf.(none)2007-10-081-0/+4
|\ \ \ \ | | |_|/ | |/| | | | | | into alf.(none):/src/bug28774/my51-bug28774
| * | | Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and iggy@alf.(none)2007-10-081-0/+4
| | | | | | | | | | | | | | | | | | | | doesn't clean them up - Make sure to cleanup temporary files after use.
| * | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-mainttnurnberg@sin.intern.azundris.com2007-09-151-2/+7
| |\ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/tnurnberg/15327/50-15327
* | \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttnurnberg@sin.intern.azundris.com2007-09-151-2/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | into mysql.com:/home/tnurnberg/15327/51-15327
| * | | | Merge mysql.com:/home/tnurnberg/15327/50-15327tnurnberg@sin.intern.azundris.com2007-09-151-2/+7
| |\ \ \ \ | | | |/ / | | |/| | | | | | | into mysql.com:/home/tnurnberg/15327/51-15327
View Lorry Controller Status