mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
55167 commits 2780 branches 343 tags 1.6 GiB
Commit graph

1365 commits

Author SHA1 Message Date
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
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
tsmith@ramayana.hindu.god
732eb0b4ce Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-02-18 12:18:36 -07:00
tsmith@ramayana.hindu.god
958f615f36 Merge ramayana.hindu.god:/home/tsmith/m/bk/b21158/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
 2008-02-18 12:04:22 -07:00
tsmith@ramayana.hindu.god
845b94451f Bug #28460 mysqlhotcopy silently skips a database with two alphanumerics name 
Remove code from mysqlhotcopy which deals with the so-called "RAID"
feature of older MyISAM.
 2008-02-18 11:48:33 -07:00
tsmith@ramayana.hindu.god
cd6e2ad99f Bug #21158 mysql_config doesn't include -lmygcc 
Add -lmygcc to mysql_config output for libs, libs_r, and embedded_libs.

Required when linking against our static libs, if yassl is used, and gcc
used to build library is significantly different from that which is using
the library.
 2008-02-14 01:05:25 -07:00
joerg@trift2.
341258dba4 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-02-13 13:05:07 +01:00
kostja@dipika.(none)
e9c887cc3d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
 2008-02-08 18:55:07 +03:00
davi@mysql.com/endora.local
1c6768c487 Bug#32633 Can not create any routine if SQL_MODE=no_engine_substitution 
The problem is that one can not create a stored routine if sql_mode
contains NO_ENGINE_SUBSTITUTION or PAD_CHAR_TO_FULL_LENGTH. Also when
a event is created, the mode is silently lost if sql_mode contains one
of the aforementioned.  This was happening because the table definitions
which stored sql_mode values weren't being updated to accept new values
of sql_mode.

The solution is to update, in a backwards compatible manner, the various
table definitions (columns) that store the sql_mode value to take into
account the new possible values. One incompatible change is that if a event
that is being created can't be stored to the mysql.event table, an error
will be raised.

The tests case also ensure that new SQL modes will be added to the mysql.proc
and mysql.event tables, otherwise the tests will fail.
 2008-02-07 08:47:39 -02:00
mtaylor@solace.(none)
9a2090fcdd Strip comments from queries before explaining them. Fixes BUG#34339 2008-02-06 04:33:27 +01:00
tsmith@ramayana.hindu.god
c99d06a5f3 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-02-05 16:15:07 -07:00
kent@mysql.com/kent-amd64.(none)
ae9a5a2fea Makefile.am, CMakeLists.txt, make_win_bin_dist: 
Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"
 2008-01-31 20:55:58 +01:00
mkindahl@dl145h.mysql.com
4c95b29614 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-01-31 17:46:50 +01:00
tsmith@ramayana.hindu.god
e75e8d6321 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/done/b32679/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-01-23 16:59:44 -07:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
cb00c20749 Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/bug-31736-5.1 
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/bug-31736/5.1
 2008-01-08 14:04:03 +00:00
df@pippilotta.erinye.com
5c028eb402 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2008-01-02 22:26:41 +01:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
e286ac998c Use pkglibdir to simplify pkgplugindir, and fix the path in a 
couple of Makefiles.  Continuation of the fix for bug#31736.
 2008-01-02 13:00:46 +00:00
kent@mysql.com/kent-amd64.(none)
e45e7d9e2e Makefile.am, CMakeLists.txt, mysql_secure_installation.pl.in: 
Added Perl version of script "mysql_secure_installation"
make_win_bin_dist:
  Corrected copy of SQL files to "share" directory
 2007-12-28 22:58:54 +01:00
joerg@trift2.
98e5fc1211 Merge trift2.:/MySQL/M51/bug33536-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-28 16:28:15 +01:00
joerg@trift2.
06a7d7be41 scripts/make_binary_distribution.sh 
After-merge fix for bug#33536: The target to copy to is now called "$DEST".
 2007-12-28 16:10:17 +01:00
joerg@trift2.
b74c11223e Merge trift2.:/MySQL/M51/bug33536-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-28 15:50:44 +01:00
joerg@trift2.
6d693d1b7e Merge trift2.:/MySQL/M50/bug33536-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-12-28 15:44:35 +01:00
joerg@trift2.
46b437cd3c Merge trift2.:/MySQL/M50/bug33536-5.0 
into  trift2.:/MySQL/M51/bug33536-5.1
 2007-12-28 15:26:55 +01:00
joerg@trift2.
9e1dbd5bd9 Merge trift2.:/MySQL/M41/bug33536-4.1 
into  trift2.:/MySQL/M50/bug33536-5.0
 2007-12-28 13:31:24 +01:00