mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39977 commits 2778 branches 343 tags 1.6 GiB
Commit graph

39977 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
de932f2a5f Update the binlog format parse routine to only be avaliable in 5.1 and allow for any binlog_format to be specified 2006-10-25 14:56:36 +02:00
msvensson@neptunus.(none)
0f25306ab3 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-25 14:43:08 +02:00
msvensson@neptunus.(none)
86cca50848 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-25 14:39:29 +02:00
msvensson@neptunus.(none)
a6d87b4c00 Add valgrinding support for mysql_client_test 
Fix two memory leaks in mysql_client_test
 2006-10-25 14:34:18 +02:00
mskold/marty@linux.site
c0ede46465 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-10-25 13:18:03 +02:00
mskold/marty@linux.site
6c8b930378 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-10-25 13:13:32 +02:00
stewart@willster.(none)
fb77211e2f Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
 2006-10-25 20:51:18 +10:00
msvensson@neptunus.(none)
f611c2cdd0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-25 12:43:16 +02:00
mskold/marty@mysql.com/linux.site
c14c547289 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-10-25 12:41:42 +02:00
msvensson@neptunus.(none)
392c00d49e Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-25 12:41:34 +02:00
msvensson@neptunus.(none)
4969081589 Set flag opt_skip_ndbcluster_slave if no slaves are being used. 
Add comments
Deperlify
 2006-10-25 12:40:33 +02:00
stewart@willster.(none)
1f05ac4ac3 post merge fixes (from merging test fixes from bug 19914) 2006-10-25 20:37:10 +10:00
mskold/marty@mysql.com/linux.site
0dea24947d Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-10-25 12:21:45 +02:00
mskold/marty@mysql.com/linux.site
deb26a93e5 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
 2006-10-25 11:45:47 +02:00
mskold/marty@mysql.com/linux.site
44e55e3b43 Bug #21072 Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings 2006-10-25 11:44:40 +02:00
petr/cps@owlet.local
e2d8d52293 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-rename-bug
 2006-10-25 13:04:07 +04:00
petr/cps@mysql.com/owlet.local
f01df1fd0a fix test failures in the runtime tree 2006-10-25 12:54:59 +04:00
knielsen@ymer.(none)
df8c9272e8 Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp 
into  ymer.(none):/usr/local/mysql/mysql-4.1-ndb
 2006-10-25 10:46:00 +02:00
knielsen@ymer.(none)
6445ae3312 Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp 
into  ymer.(none):/usr/local/mysql/mysql-5.0-ndb
 2006-10-25 10:45:11 +02:00
knielsen@ymer.(none)
e43c5fca48 Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
 2006-10-25 10:44:22 +02:00
stewart@willster.(none)
d5810cd067 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
 2006-10-25 18:41:17 +10:00
knielsen@ymer.(none)
44aa0f4de1 Fix two small problems in the source, potentially causing user-visible 
bugs.
 2006-10-25 10:37:53 +02:00
stewart@willster.(none)
a4faddc64f Merge bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
 2006-10-25 17:24:20 +10:00
jonas@perch.ndb.mysql.com
d9d7c7859a Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-25 08:49:35 +02:00
jonas@perch.ndb.mysql.com
5230dcebcc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-25 08:45:06 +02:00
jonas@perch.ndb.mysql.com
0f74244d86 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2006-10-25 08:40:34 +02:00
jonas@perch.ndb.mysql.com
61f87f5d3c Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-25 08:31:30 +02:00
jonas@perch.ndb.mysql.com
6e4a0ec042 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-25 08:28:30 +02:00
malff/marcsql@weblab.(none)
9cf77b0b78 Fixed build break. 2006-10-24 18:16:11 -07:00
msvensson@neptunus.(none)
f186d913fa Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-25 02:27:22 +02:00
msvensson@neptunus.(none)
99f5f356b3 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-25 02:25:03 +02:00
msvensson@neptunus.(none)
8f5d3175bc partition.teest does not use innodb thus it can be run even without innodb 2006-10-25 02:24:08 +02:00
msvensson@neptunus.(none)
9906a10a27 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 23:40:11 +02:00
msvensson@neptunus.(none)
1f780b77e7 Adapt mysql-test-run.pl to mysqld in 5.1 using "mixed" binlog format by default 2006-10-24 23:39:46 +02:00
tsmith/tim@siva.hindu.god
3af2089b13 Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-10-24 14:42:08 -06:00
msvensson@neptunus.(none)
74d8113c2e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 22:02:33 +02:00
msvensson@neptunus.(none)
23700ab32b Update the reference file for mysql API/ABI for 5.0 2006-10-24 22:00:08 +02:00
msvensson@neptunus.(none)
e0985bef96 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 21:05:35 +02:00
msvensson@neptunus.(none)
ac5b37ef00 Pass --core-file option to mysqld when bootstrapping 2006-10-24 21:02:04 +02:00
pekka@orca.ndb.mysql.com
64c414a004 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
 2006-10-24 20:52:09 +02:00
msvensson@neptunus.(none)
e4b65a9947 Merge neptunus.(none):/home/msvensson/mysql/bug23427/my41-bug23427 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-24 20:41:48 +02:00
msvensson@neptunus.(none)
1a7676fa65 WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks 
BUG#23427 incompatible ABI change in 5.0.26?
   - Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file
 2006-10-24 20:32:07 +02:00
tsmith@maint1.mysql.com
8f75d0913b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/51
 2006-10-24 20:01:01 +02:00
msvensson@neptunus.(none)
2ed61076d4 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 19:23:26 +02:00
msvensson@neptunus.(none)
56d2a6fd3c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 19:22:48 +02:00
msvensson@neptunus.(none)
844369130f Remove debug printout 2006-10-24 19:22:27 +02:00
msvensson@neptunus.(none)
00c2535bbd Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 19:16:45 +02:00
msvensson@neptunus.(none)
28ca3dea79 Bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table" 
- Fix check in mysql_client_test to reflect the change of datatype
   for DEFAULT column
 2006-10-24 19:16:18 +02:00
mmj@tiger.local[mmj]
da721fe7aa Bug #23427: incompatible ABI change in 5.0.26? 
Revert 1 June change enough to restore ABI compatibility with previous
versions.
 2006-10-24 19:05:11 +02:00
msvensson@neptunus.(none)
52aaf251bd Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 18:52:01 +02:00