Commit graph

23147 commits

Author SHA1 Message Date
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +02:00
joerg@mysql.com
830d25d985 Manual merge. 2005-05-25 18:11:03 +02:00
joerg@mysql.com
0d121fe01a Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken.
(bug#10674, bug#10681)
2005-05-25 16:24:07 +02:00
svoj@mysql.com
b763679f1c WL#2286 - Compile MySQL w/YASSL support
Merge with latest yaSSL, fix compilation error for SSE2 processors.
2005-05-25 19:11:36 +05:00
marko@hundin.mysql.fi
5a8cfc1541 srv0start.c:
innobase_shutdown_for_mysql(): Do very fast shutdown
  only if srv_fast_shutdown==2, not if srv_fast_shutdown!=0
  (Bug #9673)
2005-05-25 12:41:57 +03:00
stewart@mysql.com
119e500c80 BUG#10831 ndb mgmd LogDestination maxfiles does not rotate logs properly 2005-05-25 15:35:51 +10:00
stewart@mysql.com
274fee09c9 BUG#10796 Incorrect check-cpu result for ppc linux gcc 2005-05-25 12:18:18 +10:00
acurtis@xiphis.org
248a6934bb Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into xiphis.org:/usr/home/antony/work2/p3-bug7241.6
2005-05-24 22:51:02 +01:00
acurtis@xiphis.org
9c8b4c93bb Fix after merge 2005-05-24 22:31:57 +01:00
Sinisa@sinisa.nasamreza.org
e94f4fa8e0 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-05-24 22:44:18 +03:00
dlenev@mysql.com
b92c9f1424 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg5860
2005-05-24 23:39:25 +04:00
svoj@mysql.com
bc6371a998 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-05-25 00:27:38 +05:00
svoj@mysql.com
1dabee5aad Upgrade yaSSL to 0.9.9. 2005-05-25 00:15:06 +05:00
serg@serg.mylan
4290e7c73a Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-24 21:06:45 +02:00
serg@serg.mylan
e2c8f63ed4 simplifying new/my_arg_new wrapping 2005-05-24 21:02:42 +02:00
dlenev@mysql.com
1449d44e1c Manual merge of patch fixing several trigger related bugs with main tree. 2005-05-24 22:35:41 +04:00
dlenev@brandersnatch.localdomain
007a205918 Fix for bugs:
#5860 "Multi-table UPDATE does not activate update triggers"
 #6812 "Triggers are not activated for INSERT ... SELECT"
 #8755 "Trigger is not activated by LOAD DATA".
This patch also implements proper handling of triggers for special forms
of insert like REPLACE or INSERT ... ON DUPLICATE KEY UPDATE. 
Also now we don't call after trigger in case when we have failed to
inserted/update or delete row. Trigger failure should stop statement
execution.

I have not properly tested handling of errors which happen inside of
triggers in this patch, since it is simplier to do this once we will be
able to access tables from triggers.
2005-05-24 22:19:33 +04:00
brian@zim.(none)
46a3eef67d Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into zim.(none):/home/brian/mysql/mysql-4.1
2005-05-24 10:48:03 -07:00
Sinisa@sinisa.nasamreza.org
df53be3dfe Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-05-24 19:47:18 +03:00
jani@ua141d10.elisa.omakaista.fi
ed2e508bdd Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-05-24 18:23:31 +03:00
acurtis@xiphis.org
4a77febaab Merge 2005-05-24 15:52:48 +01:00
jani@ua141d10.elisa.omakaista.fi
5254d52cb6 Added a test case for Bug#8009. 2005-05-24 17:50:17 +03:00
reggie@mdk10.(none)
0f43a4719e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/41test2
2005-05-24 09:02:56 -05:00
reggie@mdk10.(none)
6726b9fd09 removed unneeded reserved_win_names testcase 2005-05-24 09:01:06 -05:00
acurtis@xiphis.org
565c20ecbf Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into xiphis.org:/usr/home/antony/work2/p3-bug7241.5
2005-05-24 13:40:25 +01:00
acurtis@xiphis.org
72f9abbf76 Add comments 2005-05-24 13:38:46 +01:00
jan@hundin.mysql.fi
16c96b88d5 Print information about XA recovery only if there are prepared XA transactions
after recovery.
2005-05-24 14:06:44 +03:00
acurtis@xiphis.org
a6a589ef76 Bug#7241 - Invalid response when DELETE .. USING and LOCK TABLES used.
Only acquire necessary write lock for multi-delete
2005-05-24 11:44:34 +01:00
gluh@mysql.com
ce5d59d380 Merge gluh@gluh:/home/gluh/release/mysql-5.0-build
into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0
2005-05-24 15:35:24 +05:00
gluh@gluh.mysql.r18.ru
077346c746 Fix for bug #10659: information_schema_db fail on Mac OS 2005-05-24 14:35:23 +04:00
pem@mysql.com
8832f3e1c5 Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-05-24 10:19:10 +02:00
lars@mysql.com
93565c8e7d Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-24 01:09:23 +02:00
gbichot@bk-internal.mysql.com
a49ccfe6f0 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/data0/bk/mysql-5.0
2005-05-24 00:31:28 +02:00
gbichot@bk-internal.mysql.com
76a20eb397 marking the file gone again to hopefully get the tree on its feet 2005-05-23 23:54:39 +02:00
pem@mysql.comhem.se
3c2c8bf9a2 Fixed on BUG#6048: Stored procedure causes operating system reboot
Memory leak in locally evalutated expressions during SP execution fixed by
  reusing allocated item slots when possible.
  Note: No test case added, since the test is a stress test that tries to make
  the machine to run out of memory.
  Second attempt, now tested with debug build, valgrind build, max (optimized)
  build, with and without --debug, --vagrind and --ps-protocol.
  Errors in trigger and view test with --debug in debug build where present
  before this patch, and likewise for valgrind warnings for view test in
  valgrind build with --ps-protocol.
2005-05-23 23:43:43 +02:00
reggie@mdk10.(none)
3384ecc988 BUG# 9148 Denial of service
fixups of test case and comment formatting
2005-05-23 14:48:25 -05:00
kent@mysql.com
181f21c5d2 mysqld.dsp:
Added BLACKHOLE and FEDERATED storage engines for max builds
  Some preparations for including yaSSL
ha_federated.cc:
  Use local seach path for "mysql_priv.h"
2005-05-23 21:15:00 +02:00
lars@mysql.com
a21eb5d026 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-23 21:05:30 +02:00
konstantin@mysql.com
52d6288e2d A comment for view_prepare_mode. 2005-05-23 22:38:12 +04:00
msvensson@neptunus.(none)
df309c622f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
2005-05-23 20:20:22 +02:00
reggie@mdk10.(none)
90a54200c0 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-05-23 13:03:11 -05:00
reggie@mdk10.(none)
c5f68180f4 merged changes from 4.1 2005-05-23 12:55:39 -05:00
reggie@mdk10.(none)
c492ffcf2e BUG#10687 - Merge engine fails under Windows
This final cset is to fix a syntax problem in ha_myisammrg.cc where a / was left out of a format string.
It also adds a check in has_path to avoid a possible redundant comparison.

ha_myisammrg.cc:
  Replaced missing / in format string
my_getwd.c:
  Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison
2005-05-23 12:31:22 -05:00
reggie@mdk10.(none)
799b773aae Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-05-23 12:08:57 -05:00
reggie@mdk10.(none)
1c0da6110e BUG# 10687: Merge engine fails under Windows
This cset is to roll out the cset applied earlier from Ingo.
This bug has been fixed with a different cset.
2005-05-23 12:05:15 -05:00
msvensson@neptunus.(none)
197978e3d1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
2005-05-23 19:01:16 +02:00
msvensson@neptunus.(none)
548994aa7b Build fixes for icc, compile _without_ "-no-gnu" 2005-05-23 18:53:53 +02:00
reggie@mdk10.(none)
c9e7c0fd56 BUG# 10687: MERGE Engine fails on Windows
This is a replacement for the original patch given by Ingo.  This one comes
from Monty.
The problem is that merge files now use unix style pathnames on all 
platforms.  The merge file open code was not properly converting those
pathnames back to non-unix when necessary.
2005-05-23 11:53:16 -05:00
gbichot@quadita2.mysql.com
83994a4d4c Removing mysqlshutdown and mysqlwatch from the Windows packages, removing their sources.
They were both undocumented and not much useful. Removal has been agreed with Mark, Miguel and MikeZ.
Removing winmysqladmin from the source (it was not included anymore in no Windows package). I'll do a test Windows noinstall.zip build before push.
MikeZ just removed mysqlshutdown and mysqlwatch from the installer scripts.
2005-05-23 16:50:20 +02:00
lars@mysql.com
4e2766ffc7 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-23 16:23:05 +02:00