Commit graph

1387 commits

Author SHA1 Message Date
Tatiana A. Nurnberg
963167e0ff automerge 2009-02-24 09:07:40 +01:00
Tatiana A. Nurnberg
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
Timothy Smith
401a83cac3 Auto-merge 5.1-build -> 5.1-bugteam 2009-02-07 16:29:37 +01:00
kent.boortz@sun.com
971252b12f Merge from mysql-5.1.31-release 2009-02-05 20:34:22 +01:00
Chad MILLER
fdd9ad2cb7 Merge from 5.0-bugteam. 2009-02-04 14:26:04 -05:00
Chad MILLER
69cd86934d Merge from bug tree. 2009-02-04 13:57:33 -05:00
Kent Boortz
63c4888cf9 From 5.0.48 the NDB client libraries has been missing in the cluster
packages, this is now corrected (Bug#42278)
2009-01-23 02:59:03 +01:00
MySQL Build Team
47844077fd Incorrect test if "--short-product-tag=" was given or not 2009-01-19 17:48:05 +01:00
MySQL Build Team
4915050033 Fixed typo 2009-01-17 09:29:40 +01:00
MySQL Build Team
951d045231 Added option "--short-product-tag=<string>" to "make_binary_distribution.sh",
to enable product name and server suffix to differ.
2009-01-15 20:09:58 +01:00
Jonathan Perkin
240baba269 bug#41828: mysql_install_db misses mysqld options when using --basedir
* pass --languages to mysqld when using --basedir
  * improve error messages when unable to find files in basedir
2009-01-06 15:08:15 +00:00
Chad MILLER
0e44a4e94c Bug#32136: mysqld_multi --defaults-file not respected while using \
--mysqld=mysqld_safe

The server run didn't know the correct section to read in a
configuration file, and would read from "[mysqld]" even though
mysqld_multi had already read the defaults and made them into explicit
parameters. 

Worse, the "defaults-file" parameter says that it means "Read only
this configuration file, do not read the standard system-wide and
user-specific files", which should apply not only to mysql-multi, but
to the server also.

So, now if "defaults-file" is given, put "no-defaults" before all the
explicit parameters we read from the defaults-file and feed to the
mysqld or mysqld_safe.
2008-11-26 10:51:59 -05:00
Tatiana A. Nurnberg
8a774dcc68 Bug#34025: mysql_config is not returning -ldl lib flag needed when using embedded server
mysql_config did not output -ldl (or equivalent) when needed for --libmysqld-libs,
so its output could be insufficient to build an application using the embedded
server.

LIBDL was already set in configure; it's now propagated all the way into the
relevant mysql_config scripts.
2008-11-10 22:12:15 +01:00
Chad MILLER
6597382c2a Merge fix for bug 34129. 2008-10-14 15:59:01 -04:00
Chad MILLER
628a7dd2bc In mysqldumpslow, consume arbitrary whitespace in the Query_time line. 2008-10-14 15:52:52 -04:00
Chad MILLER
1b488e528e Merge fix for Bug#35754. 2008-10-03 11:54:22 -04:00
Chad MILLER
bf996620cd Bug#35754: mysql_install_db does not work if no hostname is set
Machines with hostname set to "localhost" cause uniqueness errors in 
the SQL bootstrap data.

Now, insert zero lines for cases where the (lowercased) hostname is 
the same as an already-inserted 'localhost' name.  Also, fix a few tests 
that expect certain local accounts to have a certain host name.
2008-09-24 08:59:56 -04:00
Timothy Smith
fb2c9d8232 Auto merge 5.1-build -> 5.1-bugteam 2008-09-10 19:35:11 -06:00
Magnus Svensson
1ac6fb4b2e Merge bug#31315 2008-09-02 11:14:13 +02:00
Magnus Svensson
447fa91d83 Bug#31315 mysql_install_db fails if a default table type of NDB is set in my.cnf
- Use myisam as default storage engine when running mysqld in --bootstrap mode
2008-09-02 10:53:30 +02:00
Joerg Bruehe
811337dd72 Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build
Merge it up from 5.0 to 5.1,
adapt to some version differences.
2008-08-27 16:03:39 +02:00
Joerg Bruehe
ff3d230a03 Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build
Mostly, this affected files (programs, scripts, and manual pages)
which got built during a RPM build but were not listed in the
appropriate "%files" section of the "spec" file.
This is fixed now, they are added.

To make this consistent, this patch also makes the build of "innochecksum"
(and its inclusion in a tar.gz or other package) depend on whether InnoDB
is configured in the build.

Also, some tools to create Windows packages are irrelevant in any binary
Unix package (not the sources !), and so they are deleted before packaging.
2008-08-25 21:07:41 +02:00
Georgi Kodinov
a0768d32c2 Bug#34159: mysql_install_db fails with sql_mode=TRADITIONAL
Reset session sql_mode before creating system tables as it
is done in the mysql_fix_privilege_tables.sql script.
2008-07-31 12:28:04 +03:00
Chad MILLER
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
Joerg Bruehe
5672b953cc Merge the fix for bug#37623 (Suffix "-64bit" is duplicated)
from 5.0 into the 5.1.26 release clone.
2008-06-27 19:36:45 +02:00
Joerg Bruehe
07268a15a1 OS X 10.5 is now a supported platform,
so Apple's internal name ("darwin9") must be translated to ours ("osx10.5").
2008-06-27 19:12:42 +02:00
Timothy Smith
aa45d0c01f Bug #37024: Wrong location of messagefiles
make_binary_distribution.sh got clobbered by the 5.0 version during a merge.
This caused a few packaging problems, including message files put in the wrong
place and some missing files.  Fix is just to revert back to the 5.1 version
from before the merge.

Problem introduced in
ChangeSet 1.2606.2.1 2008/05/13 15:56:07 kent@kent-amd64.(none)

This change was made in the 5.1.25 release clone in BK, but never made it to the main mysql-5.1 BK tree.  I am adding it to mysql-5.1 bzr.
2008-06-17 19:04:10 -06:00
kent@kent-amd64.(none)
fc30f6d5b4 Merge mysql.com:/home/kent/bk/mysql-5.0-release-merge
into  mysql.com:/home/kent/bk/mysql-5.1
2008-05-13 15:56:07 +02:00
kent@mysql.com/kent-amd64.(none)
eaa4d4e5a7 make_binary_distribution.sh:
Copy all of the "std_data" directory
2008-04-28 21:53:52 +02:00
davi@mysql.com/endora.local
5d725bfdf8 Bug#35824: mysql_upgrade does not fix scheduler tables when upgrading from 5.1.23 to 5.1.24
The problem is that when upgrading the event table, the sql_mode
column was always being added instead of being updated to list new
sql_mode values, causing upgrades of the event which already have
a sql_mode column to not be updated to the new sql_mode values.

The solution is to always add first a stub sql_mode column and
subsequently update the column to the new sql_mode values.
2008-04-04 13:46:05 -03:00
tsmith@ramayana.hindu.god
203de67618 Merge ramayana.hindu.god:/home/tsmith/m/bk/b25486/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-03-19 13:44:50 -06:00
joerg@trift2.
30f3d4ab46 Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-03-14 15:09:10 +01:00
joerg@trift2.
e784898959 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-03-14 14:41:08 +01:00
joerg@trift2.
b399594a4a Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-03-14 14:32:01 +01:00
kaa@kaamos.(none)
0a7052e4d3 Merge kaamos.(none):/data/src/mysql-5.1
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-03-12 11:19:46 +03:00
kaa@kaamos.(none)
d0eb90501d Merge kaamos.(none):/data/src/mysql-5.0
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-03-12 10:59:15 +03:00
kent@kent-amd64.(none)
006adbd412 Merge mysql.com:/home/kent/bk/build/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
2008-03-11 15:28:45 +01:00
kent@mysql.com/kent-amd64.(none)
878b333680 make_win_bin_dist:
Include .pdb files for tools and libraries (bug#35104)
2008-03-11 15:21:58 +01:00
tsmith@ramayana.hindu.god
1cda9d124b Bug #25486: mysqld_multi.server.sh missing from builds
Make mysqld_multi.server executable, and allow it to be installed
via chkconfig on LSB-compliant systems.
2008-03-10 03:25:54 -06:00
tnurnberg@white.intern.koehntopp.de
10bf47abf3 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/misc/mysql/29645/51-29645
2008-03-10 06:52:32 +01:00
tnurnberg@white.intern.koehntopp.de
6ad2340f63 Merge mysql.com:/misc/mysql/29645/50-29645
into  mysql.com:/misc/mysql/29645/51-29645
2008-03-10 06:44:31 +01:00
iggy@amd64.(none)
3f7a608f0e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  amd64.(none):/src/bug27101/my51-bug27101
2008-03-07 16:10:55 -05:00
iggy@amd64.(none)
de35f05a88 Merge amd64.(none):/src/bug27101/my50-bug27101
into  amd64.(none):/src/bug27101/my51-bug27101
2008-03-07 16:01:13 -05:00
iggy@amd64.(none)
c6f63bc5bb Bug #27101 mysqlhotcopy --record_log_pos retrieves wrong slave parameters
- Make sure mysqlhotcopy doesn't create unrestorable slaves.
2008-03-07 15:45:40 -05:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
2ebdd5ea2f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1
2008-03-06 15:13:14 +00:00
joerg@trift2.
00160fe9e9 Include "mysql_upgrade_shell.pl" in a binary distribution on Windows. 2008-03-05 14:03:05 +01:00
joerg@trift2.
773855c800 scripts/CMakeLists.txt : Treat "mysql_upgrade_shell" the same way as all the other scripts. 2008-03-04 22:00:53 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
874e919872 Bug#29645: Link failure when using the embedded server
mysql_config --cflags gave a flag that forced the HP/UX
C++ compiler into C-mode; as a result, C++ sources could
not be compiled correctly.

We now filter out the offending flag (like we do for Sun)
so that --cflags will work for both C and C++.
2008-02-25 07:50:55 +01:00
tsmith@ramayana.hindu.god
45442d08d4 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-22 17:08:01 -07:00
tsmith@ramayana.hindu.god
a5e90661d8 Merge ramayana.hindu.god:/home/tsmith/m/bk/b28460/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-22 17:04:28 -07:00