mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33718 commits 2789 branches 343 tags 1.7 GiB
Commit graph

33718 commits

This branch
This branch
All branches
Author SHA1 Message Date
df@kahlann.erinye.com
68335d812d Merge dev:my/mysql-5.0-release 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-14 14:58:59 +01:00
df@kahlann.erinye.com
4dd2d7062a Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-14 14:48:29 +01:00
df@kahlann.erinye.com
5d8525c6f7 make_binary_distribution should of course also copy .test files from mysql-test/include 2006-11-14 14:44:20 +01:00
kaa@polly.local
fb30aeaa81 Merge polly.local:/tmp/maint/bug22129/my50-bug22129 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-11-14 16:38:11 +03:00
kaa@polly.local
25e75e7074 Merge polly.local:/tmp/maint/bug22129/my41-bug22129 
into  polly.local:/home/kaa/src/maint/mysql-4.1-maint
 2006-11-14 16:36:31 +03:00
df@kahlann.erinye.com
cc129e6256 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-14 14:29:58 +01:00
df@kahlann.erinye.com
a863fbbf41 make dist now copies .test files in mysql-test/include 2006-11-14 14:29:05 +01:00
joerg/mysqldev@mysql.com/production.mysql.com
2ddb61eb93 Raise version number after cloning 5.0.30 2006-11-14 13:37:10 +01:00
joerg@trift2.
d22948a193 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/mysql-5.0
 2006-11-14 12:47:53 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
650a245568 bug#19402 SQL close to the size of the max_allowed_packet fails on the slave 
ver 5.0 and 5.1 refinement.
adding to the MAX_SIZE_LOG_EVENT_STATUS estimation status vars and 
EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN
 2006-11-14 12:48:17 +02:00
msvensson@neptunus.(none)
589ccae74c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-14 09:43:30 +01:00
msvensson@neptunus.(none)
94ea2ef88c Fix "make dist" 2006-11-14 09:42:01 +01:00
msvensson@neptunus.(none)
48ad8c53ce Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-14 09:18:46 +01:00
cmiller@zippy.cornsilk.net
ff26bf49c8 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-13 13:19:13 -05:00
msvensson@neptunus.(none)
0b60b7d59a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 19:19:02 +01:00
msvensson@neptunus.(none)
e09df84aa5 Remove test-force-pl-mem and add test-force-mem 2006-11-13 19:16:23 +01:00
cmiller@zippy.cornsilk.net
8471897fbc Bug#18761: constant expression as UDF parameters not passed in as constant 
The code that set up data to be passed to user-defined functions was very
old and analyzed the "Type" of the data that was passed into the UDF, when
it really should analyze the "return_type", which is hard-coded for simple
Items and works correctly for complex ones like functions.
---
Added test at Sergei's behest.
 2006-11-13 13:13:44 -05:00
msvensson@neptunus.(none)
29d1e3230b Use mysql-test-run.pl 2006-11-13 19:12:34 +01:00
lars@mysql.com/black.(none)
7aa562ad20 Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-13 17:54:01 +01:00
msvensson@neptunus.(none)
f105e0ecd0 Merge neptunus.(none):/home/msvensson/mysql/bug19817/my50-bug19817 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 17:51:33 +01:00
msvensson@neptunus.(none)
bf020e5ea6 Bug#19817 error when try to compile PHP5.1 with mysql 5.0.21 static libs 
- Most likely caused by linking with libmysqlclient using gcc and not g++.
 - Removing our "yassl_dummy_link_fix" hacks so some test programs are linked
   with gcc 
 - Remove build of non working test programs in vio
 2006-11-13 17:16:37 +01:00
msvensson@neptunus.(none)
91518b335e Expect the file "have_mysql_upgrade.result" to contain the 
result from "require mysql_upgrade"
 2006-11-13 16:55:05 +01:00
msvensson@neptunus.(none)
bf8a9e544c Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 16:39:44 +01:00
gkodinov/kgeorge@rakia.gmz
e347eb1995 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B19216-4.1-opt
 2006-11-13 15:40:19 +02:00
gkodinov/kgeorge@macbook.gmz
cd7613b265 merge 4.1->5.0 of the test suite for bug 19216 2006-11-13 15:37:04 +02:00
msvensson@neptunus.(none)
68a7d45a0a Use same type for function declaration and definition 2006-11-13 13:45:40 +01:00
msvensson@neptunus.(none)
5687847387 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint-mysql_upgrade 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 13:40:37 +01:00
msvensson@neptunus.(none)
5110d91ec3 Make it possible for .test suites to run "mysql_upgrade" 
Add new test file mysql_upgrade.test
 2006-11-13 13:39:49 +01:00
msvensson@neptunus.(none)
3eff32965d Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 13:33:33 +01:00
msvensson@neptunus.(none)
0ef85c5d8d Remove the tmp file produced when checking abi 2006-11-13 13:32:39 +01:00
msvensson@shellback.(none)
bd8cdc267a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 13:22:12 +01:00
lars@mysql.com/black.(none)
c5d56416ba Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-13 12:44:53 +01:00
lars@mysql.com/black.(none)
de01754c19 Merge mysql.com:/home/bkroot/mysql-4.1-rpl 
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
 2006-11-13 12:44:24 +01:00
msvensson@neptunus.(none)
716621db3f Make --mem a pure flag. If there is need to specifically set the location 
use MTR_MEM environment variable
 2006-11-13 12:44:12 +01:00
gkodinov/kgeorge@macbook.gmz
d6672f711d Merge macbook.gmz:/Users/kgeorge/mysql/work/B19216-4.1-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B19216-5.0-opt
 2006-11-13 12:44:56 +02:00
gkodinov/kgeorge@macbook.gmz
9a41822bdd Bug #19216: Client crashes on long SELECT 
The server sends a number of columns to the client.
 It uses a limited "fast" function for that instead of the
 general one. This fast function cannot send numbers larger 
 than 2 bytes. 
 This causes the client to expect smaller number of columns. 
 The client writes outside of the allocated memory buffer 
 as a result.
 Fixed the server to use the general function to send column
 count.
 Fixed the client to check the column count before writing
 column data.
 2006-11-13 12:28:55 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
5a20c54201 bug#19402 SQL close to the size of the max_allowed_packet fails on the slave 
comments are fixed as was suggested in reviews.
 2006-11-12 20:01:58 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
fe5de9f5c3 Correcting BUG/WL identifier extraction to allow multiple references to auxilary 
bugs/wls in cset's comments. The targetted BUG's or WL's identifier must be specified
the first in the comments. The referred bugs wls can be typed in same as the targeted
clickable format.
If the the target of the fix is a WL and there are some references to bugs
then the first found reference is regarded as "co-target" so that the bug's identifier
comes up on the subject line along with the WL's and commit mail will update
the bug page. The latter feature can be disarmed (if there is no need to update
the referred bug's page) with typing the first a pseudo-bug pattern (bug#0).

This paticular cset will generate subject line containing bug#0 (as it was the first
referred) whereas the old version would put in the subject line the last referred
pattern (e.g bug#2147483648).
 2006-11-12 13:38:13 +02:00
kostja@bodhi.local
0f455a81dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-12 10:55:33 +03:00
cmiller@zippy.cornsilk.net
73e72717e7 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my41-bug22860 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-11-11 09:01:25 -05:00
cmiller@zippy.cornsilk.net
2cbb366863 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-11 09:01:09 -05:00
cmiller@zippy.cornsilk.net
7aa1e7190d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my41-bug22860 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860
 2006-11-11 08:57:26 -05:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1319f3552c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-11-11 14:32:10 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
cddbb0f817 mysql-test-run.pl: 
Test for base directory when a RPM install corrected
 2006-11-11 14:12:30 +01:00
kostja@bodhi.local
0cdaa7c138 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-11 14:51:19 +03:00
cmiller@zippy.cornsilk.net
72dfd02634 Bug #22860: Option --memlock should be revisited 
Support says that memlock doesn't work on OSes other than Solaris.  
Add a warning about --memlock to the crash monologue.
 2006-11-10 16:36:08 -05:00
iggy@rolltop.ignatz42.dyndns.org
3488f21817 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
 2006-11-10 15:53:34 -05:00
iggy@rolltop.ignatz42.dyndns.org
b808c8e829 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-11-10 15:52:49 -05:00
iggy@rolltop.ignatz42.dyndns.org
82ad2e5e92 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix
 2006-11-10 15:49:10 -05:00
iggy@rolltop.ignatz42.dyndns.org
73ff367be3 Test Suite failing on Windows because the $opt_report_features variable was not defined before use. 2006-11-10 15:47:11 -05:00