mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40406 commits 2793 branches 343 tags 1.5 GiB
Commit graph

40406 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
a3d8fdbeb9 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/51
 2006-11-14 14:49:45 +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
67ca3dde0b Merge polly.local:/tmp/maint/bug22129/my51-bug22129 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2006-11-14 16:40:35 +03: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
5fb072b0fc Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/51
 2006-11-14 14:31:36 +01: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
a7c31fa761 Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50_1
 2006-11-14 13:04:40 +02: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)
f1d5ec3efa Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-14 09:49:35 +01: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
msvensson@neptunus.(none)
39d1a2425b Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-13 21:21:38 +01:00
msvensson@neptunus.(none)
d54846ab3e Modify search path for mysql_client_test to look in "bin" not to look for "bin", 
this caused mysql_client_test to fail when running from binary dist
 2006-11-13 20:44:22 +01:00
msvensson@neptunus.(none)
656f1103c4 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-13 19:29:01 +01:00
cmiller@zippy.cornsilk.net
fbfeccfe91 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-13 13:19:49 -05: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
cmiller@zippy.cornsilk.net
6d97850c3b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761
 2006-11-13 13:17:02 -05: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
msvensson@neptunus.(none)
31f50324ea Remove "yassl_dummy_link_fix" in 5.1 as well 2006-11-13 18:06:05 +01:00
msvensson@neptunus.(none)
430b493806 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-13 18:02:09 +01:00
lars@black.(none)
07ac3d3a95 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-11-13 17:59:51 +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
guilhem@gbichot3.local
375eaecf6d Fix for a compilation failure: mysqladmin_SOURCES is a needed line 
in Makefile.am.
 2006-11-13 16:54:47 +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
mats@romeo.(none)
b1a0052e71 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
 2006-11-13 15:48:39 +01:00
mats@romeo.(none)
851041ec3d Fixing problem in injector code making NDB tests fire an assertion. 2006-11-13 15:42:01 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
d615edba34 configure.in: 
Raise version number after cloning 5.1.13
 2006-11-13 14:50:38 +01:00
msvensson@neptunus.(none)
683d189897 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-13 13:54:19 +01:00
msvensson@neptunus.(none)
68a7d45a0a Use same type for function declaration and definition 2006-11-13 13:45:40 +01:00
msvensson@neptunus.(none)
00a34629ef Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-13 13:41:13 +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)
4efc0f8ef4 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-13 13:38:33 +01:00
msvensson@neptunus.(none)
10d4ecfbe6 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-13 13:36:50 +01:00
msvensson@neptunus.(none)
4a28dcecea Bug#23984 mysqltest on HP-UX 
- Cleanup the Makefile for client
- Don't link mysqltest with mysys as it's been compiled with different flags.
 2006-11-13 13:36:07 +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