1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Commit Graph

1707 Commits

Author SHA1 Message Date
125315b4e4 Strip maintainer mode options from the flags written to
mysql_config. Those are mainly warning options intended
to monitor the server code and shouldn't be leaked to
client code.
2010-07-15 17:16:24 -03:00
649390ac81 Merge of mysql-trunk-bugfixing into mysql-trunk-merge. 2010-07-15 10:47:50 -03:00
f54a118249 WL#5486: Remove code for unsupported platforms
Remove Netware specific code.
2010-07-15 08:13:30 -03:00
7965b2d001 merge 2010-07-14 13:57:08 +03:00
edf16dbeb3 Bug #54004 : mysql_secure_installation identifies "local host" incorrectly
The removal of non-local root users is overzealous in
mysql_secure_installation. (Bug #54004)
2010-07-14 13:53:49 +03:00
35dcc13082 merge 2010-07-14 12:57:22 +03:00
0f3493a490 Bug #52274 : Missing path to mysql in mysql_secure_installation
Added some code to try to find the mysql command line in the most 
common places and stop if it's not there.
2010-07-09 14:11:12 +03:00
a10ae35328 Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
Essentially, the problem is that safemalloc is excruciatingly
slow as it checks all allocated blocks for overrun at each
memory management primitive, yielding a almost exponential
slowdown for the memory management functions (malloc, realloc,
free). The overrun check basically consists of verifying some
bytes of a block for certain magic keys, which catches some
simple forms of overrun. Another minor problem is violation
of aliasing rules and that its own internal list of blocks
is prone to corruption.

Another issue with safemalloc is rather the maintenance cost
as the tool has a significant impact on the server code.
Given the magnitude of memory debuggers available nowadays,
especially those that are provided with the platform malloc
implementation, maintenance of a in-house and largely obsolete
memory debugger becomes a burden that is not worth the effort
due to its slowness and lack of support for detecting more
common forms of heap corruption.

Since there are third-party tools that can provide the same
functionality at a lower or comparable performance cost, the
solution is to simply remove safemalloc. Third-party tools
can provide the same functionality at a lower or comparable
performance cost. 

The removal of safemalloc also allows a simplification of the
malloc wrappers, removing quite a bit of kludge: redefinition
of my_malloc, my_free and the removal of the unused second
argument of my_free. Since free() always check whether the
supplied pointer is null, redudant checks are also removed.

Also, this patch adds unit testing for my_malloc and moves
my_realloc implementation into the same file as the other
memory allocation primitives.
2010-07-08 18:20:08 -03:00
8f1b881616 We can't rely on mysql_config for core functionality like plugins
as it may be part of a separate package.

Work out the likliest plugin directory using similar logic to the
data directory, and avoid the dependancy.
2010-07-05 22:19:14 +01:00
ad8399acf5 Include CMAKE_{C,CXX}_FLAGS. 2010-07-05 19:32:46 +01:00
daf738448b No need to save/restore C*FLAGS, they are only used for one script.
Use CMAKE_*_FLAGS_RELWITHDEBINFO for C*FLAGS expansion, they are
the most likely to contain the flags we need.
2010-07-05 15:44:40 +01:00
261c543610 bug#54991: mysqld_safe reports syntax error and skips part of logic
while restarting server

TARGET_LINUX must be 'true' or 'false'.
2010-07-05 12:53:03 +01:00
ff381a6a33 merge 2010-07-05 13:22:13 +03:00
245645e225 Unset the execute bit where it's not needed. 2010-07-03 20:17:03 -03:00
5787f0f20e Bug #53613: mysql_upgrade incorrectly revokes TRIGGER privilege on given table
Fixed an incomplete historical ALTER TABLE MODIFY trimming the trigger 
privilege bit from mysql.tables_priv.Table_priv column.
Removed the duplicate ALTER TABLE MODIFY.
Test suite added.
2010-07-01 12:05:09 +03:00
f342706ccd Put mysqlbug back into bin/ 2010-06-30 18:47:42 +01:00
18cd34153c bug#52737 plugin_dir is set to /usr/local/mysql/lib/plugin while
starting via mysqld_safe

Rather than hardcode the plugin directory, enhance mysql_config
to fix plugin path when running a relocated install, and use it
to provide the plugin directory to mysqld_safe.
2010-06-30 12:19:54 +01:00
0b7b897dec Copy-pasted the wrong line from configure.in, fix gcc detection. 2010-06-29 19:21:59 +01:00
e74d4c2b37 mysqlbug is Unix-only. 2010-06-28 18:30:53 +01:00
c179a23cb5 Try to fix more mysqlbug problems. 2010-06-28 17:44:12 +01:00
699c31cf51 Expand some variables for mysqlbug. 2010-06-28 14:59:15 +01:00
bba0a92d03 Auto-merge from mysql-trunk-stage. 2010-06-21 17:08:16 +04:00
9891642e77 merge 2010-06-18 17:04:15 +02:00
e740b826a8 Bug#54590 "make_binary_distribution" fails because a command
line exceeds the limit

Upmerge the fix from 5.1 to 5.5 ("trunk").
2010-06-17 20:10:17 +02:00
218a15b76a Bug#54590 "make_binary_distribution" fails because a command
line exceeds the limit

Upmerge the fix from 5.0 to 5.1
2010-06-17 19:55:21 +02:00
d4c4bd6e2f Bug#54590 "make_binary_distribution" fails because a command
line exceeds the limit

The number and/or names of our files for the main test suite
(contents of "mysql-test/t/") now exceeds the command line
length limit on AIX.
Solve the problem by using separate "cp" commands for the
various file name extensions.
2010-06-17 19:47:38 +02:00
c7170276ef BUG#52737: plugin_dir is set to /usr/local/mysql/lib/plugin while starting via mysqld_safe
Incremental patch to fix plugin_dir from .../lib/plugin to .../lib/mysql/plugin.
2010-06-16 11:25:55 +02:00
89205a3bf6 post-merge fix 1 2010-05-28 16:50:23 +02:00
5f5d488978 merge 2010-05-27 16:11:13 +02:00
eff442964a Manual merge from mysql-trunk.
Conflicts:
  - mysql-test/r/partition.result
  - mysql-test/r/variables_debug.result
  - mysql-test/t/partition.test
  - mysql-test/t/variables_debug.test
2010-05-20 16:35:28 +04:00
091bcacc79 Another incarnation of the patch for Bug#30708
(make relies GNU extentions). The patch was partially
backport from 6.0.

Original comment:
bug#30708: make relies GNU extensions.  Now that we no longer use
BitKeeper we can safely remove the SCCS handling with no loss of
functionality.
2010-05-19 17:00:23 +04:00
5b85121ca6 Changes to build using CMake according to existing release packages:
- Update/fix file layouts for each package type, add new types for
   native package formats including deb, rpm and svr4.

 - Build all plugins, including debug versions

 - Update compiler flags to match current release

 - Add missing @VAR@ expansions

 - Install correct mysqclient library symlinks

 - Fix icc/ia64 builds

 - Fix install of libmysqld-debug

 - Don't include mysql_embedded

 - Remove unpackaged manual pages to avoid missing files warnings

 - Don't install mtr's test suite
2010-05-12 12:51:23 +01:00
7f514f45e6 Bug #52737: plugin_dir is set to /usr/local/mysql/lib/plugin while starting
via mysqld_safe

Plugin dir was set to a hard-coded path instead of relative the base dir.

This patch fixes this by using a path relative the basedir instead of the
plugin directory indicated by the configuration.
2010-05-11 15:55:52 +02:00
5492914383 Merge danny's Windows fix from release branch 2010-05-11 11:11:00 +02:00
b1109f0331 merge 2010-04-30 13:36:57 +02:00
940ad61b71 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:

Text conflict in configure.in
Text conflict in dbug/dbug.c
Text conflict in mysql-test/r/ps.result
Text conflict in mysql-test/t/ps.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/ha_ndbcluster.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/sql_plugin.cc
Text conflict in sql/sql_table.cc
2010-04-30 00:33:06 +04:00
b9303c87e3 On Mac OS X, add the "-arch" option to the 'mysql_config' output 2010-04-27 22:21:48 +02:00
d328d5be33 Manual merge from mysql-trunk.
Conflicts:
  - mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
2010-04-27 13:58:21 +04:00
50edf454b1 Merge 2010-04-21 14:58:09 +02:00
8dcbf6e20c Merge the changes of the 5.5.3-m3 release build
back into the development branches.
2010-04-18 15:32:05 +02:00
29f098f2d3 Make the libraries we produce on Windows actually usable 2010-04-16 10:27:18 +02:00
f3635be031 A patch for Bug#52444 (mysql_upgrade fails b/w 5.1 -> 5.5 (Celosia)).
The problem was that the code that works with stored routines was present
in mysql_system_tables.sql. This is wrong because until upgrade is finished,
stored routines may be (and were) not available.

The fix is to move that code to the end of mysql_system_tables_fix.sql.
2010-04-14 20:40:04 +04:00
20ef52e612 Bug #43594: mysqlhotcopy does not ignore log tables and others in mysql database
Added a filter to mysqlhotcopy to filter out the same tables in the 'mysql' 
database that mysqldump filters out.
2010-04-12 11:56:28 +03:00
abab51e0db Automerge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-04-11 11:17:42 +04:00
17a21c4f35 Bug #47095: Can't open_files_limit really be larger than 65535?
Several problems addressed:

1. The maximum value for --open_files_limit on non-windows boxes
is now raised to UINT_MAX (the maximum possible without significant
changes in the code). The maximum value on windows is kept to be
2048 due to a known limitation (bug 24509).

2. mysqld_safe now supports --open_files_limit=xx in addition to 
--open-files-limit=xx

3. mysqld_safe always passes through --open[_-]files[_-]limit
to the underlying mysqld. It used to pass it through only if it 
the user running the script has access to the root directory or
there was an --user argument specified.

4. Fixed a prototype in my_file.c to match its counterpart in 
the other #ifdef branch.
2010-04-09 14:47:18 +03:00
bbe86d08ba Expand @HOSTNAME@. 2010-04-01 20:47:19 +02:00
8c750455fc Just put libs in %{_libdir}.
Can't see how mysqld_safe can work with current setup, so make it look
in $pkglibdir/mysql too.

Other cleanups.
2010-04-01 10:32:29 +02:00
f0856cc114 Try a bunch of fixes. 2010-03-31 23:52:49 +02:00
f10885675c Manual merge of mysql-trunk into mysql-trunk-merge.
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
2010-03-24 18:03:44 +03:00
82b4452bd5 Some fixes for the build on Windows
as found necessary during the release build of 5.5.3-m3.
2010-03-22 16:02:31 +01:00