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

33992 commits

This branch
This branch
All branches
Author SHA1 Message Date
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
640a4de065 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 15:44:15 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
cb28572558 merge 2006-05-12 15:41:46 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c85be97f50 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:22:31 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c558d9d00d Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19502 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:14:39 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
14bbe2c0ee Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19501 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:11:46 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
113cc95f84 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19062 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:09:26 -04:00
msvensson@neptunus.(none)
9f5c15cfa8 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 11:51:04 +02:00
aelkin@mysql.com
96ca030940 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug19728_regex_win
 2006-05-12 12:40:56 +03:00
aelkin@mysql.com
f7f83cd04c Bug#19728: Test mysqldump failure 
regex is fixed for windows.
 2006-05-12 12:32:44 +03:00
msvensson@neptunus.(none)
46f1f3ed2c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 11:19:37 +02:00
msvensson@neptunus.(none)
40bfe246a9 Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
msvensson@neptunus.(none)
de507975fa Fix after merge 5.0->5.1 2006-05-12 09:10:04 +02:00
msvensson@neptunus.(none)
47a578f4e4 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 08:45:22 +02:00
tnurnberg@mysql.com
41c276aa89 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql-5.1-19509.19509
 2006-05-12 06:37:50 +02:00
reggie@linux.site
e672bdc824 removed handlerton-win.cc (again) 2006-05-11 14:46:11 -05:00
tnurnberg@mysql.com
742996dc8b Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql-5.1-19509
 2006-05-11 21:46:10 +02:00
reggie@linux.site
aed0fca38a Merge linux.site:/home/reggie/work/mysql-5.1 
into  linux.site:/home/reggie/work/mysql-5.1-test
 2006-05-11 14:46:10 -05:00
sergefp@mysql.com
319ffaf55a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-merge6
 2006-05-11 23:46:09 +04:00
sergefp@mysql.com
be11ca037a Merge mysql.com:/home/psergey/tmp_merge3 
into  mysql.com:/home/psergey/mysql-5.1-merge6
 2006-05-11 23:40:40 +04:00
reggie@big_geek.
59b3c197a6 Merge reggie@192.168.1.107:/home/reggie/work/mysql-5.1 
into  big_geek.:C:/Work/mysql/mysql-5.1-test
 2006-05-11 14:14:10 -05:00
tim@siva.hindu.god
5b9ecf1e28 Merge siva.hindu.god:/usr/home/tim/m/51/a 
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
 2006-05-11 13:14:10 -06:00
sergefp@mysql.com
431582afbb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-merge6
 2006-05-11 23:14:09 +04:00
sergefp@mysql.com
e76acd803c Merge mysql.com:/home/psergey/tmp_merge2 
into  mysql.com:/home/psergey/mysql-5.1-merge6
 2006-05-11 20:44:31 +04:00
sergefp@mysql.com
acdc038a44 Bug#19136: Manual 5.0->5.1 merge 2006-05-11 20:41:11 +04:00
reggie@big_geek.
67a692f998 performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1. 
This is being pushed to a private tree and tested before being sent to the mainline.
 2006-05-11 11:29:08 -05:00
reggie@big_geek.
3def02edd1 bringing handlerton-win.cc back after incorrectly deleteing it. It is not needed for 5.1 or later but is used by 5.0 2006-05-11 11:06:35 -05:00
sergefp@mysql.com
d2efab4d6f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-merge5
 2006-05-11 20:06:34 +04:00
sergefp@mysql.com
22c71d3db8 Merge mysql.com:/home/psergey/tmp_merge 
into  mysql.com:/home/psergey/mysql-5.1-merge5
 2006-05-11 18:41:53 +04:00
jmiller@mysql.com
2efbd96b8e Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-05-11 13:46:43 +02:00
tnurnberg@mysql.com
e6563dea12 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql-5.1-19509
 2006-05-11 12:33:43 +02:00
kroki@mysql.com
0499b30151 Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-05-11 11:28:56 +04:00
tim@siva.hindu.god
94c1a70e96 Merge siva.hindu.god:/usr/home/tim/m/51/a 
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
 2006-05-10 18:10:17 -06:00
jmiller@mysql.com
79293053c4 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-05-11 01:41:39 +02:00
jmiller@mysql.com
2ef6dffebf rpl_log.test: 
Remove comments not needed
 2006-05-11 00:59:34 +02:00
jmiller@mysql.com
0ab18c91f4 rpl_log.test: 
Correct fix for test bug #19158
 2006-05-11 00:58:13 +02:00
msvensson@neptunus.(none)
14a6cacec4 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-10 21:44:11 +02:00
msvensson@neptunus.(none)
41f1206b62 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-10 21:38:48 +02:00
msvensson@neptunus.(none)
3b9891716c Add missing drop table 2006-05-10 21:35:05 +02:00
msvensson@neptunus.(none)
6420483d6b Update test results for 5.1 2006-05-10 20:39:26 +02:00
tim@siva.hindu.god
0a8f261729 Merge siva.hindu.god:/usr/home/tim/m/51/a 
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
 2006-05-10 12:05:33 -06:00
msvensson@neptunus.(none)
c5debaa64a Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-10 20:01:35 +02:00
serg@sergbook.mysql.com
6158fc15d8 apparently "sinclude" is consireded by aclocal (up to 1.9.5) 
by a dirty word, and it complains about it, even in a comment.
 2006-05-10 13:57:58 -04:00
tim@siva.hindu.god
bc89c92c37 Bug #6061 mysql-log-rotate script - error logging doesn't use new file 
- Fix mysqld_safe so that it always passes correct --log-error argument to mysqld
- A few other minor clean-ups to mysqld_safe
 2006-05-10 11:33:36 -06:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
56b97747de BUG#19010: Fix issues with that ALTER TABLE from auto-partitioned NDB table doesn't work unless primary key exists on table. 2006-05-10 12:53:40 -04:00
joerg@mysql.com
77024900fa Merge mysql.com:/M51/unittest-5.1 into mysql.com:/M51/mysql-5.1 2006-05-10 18:10:50 +02:00
joerg@mysql.com
74f750486d Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2006-05-10 18:08:50 +02:00
serg@sergbook.mysql.com
389491834c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
 2006-05-10 11:45:40 -04:00
joerg@mysql.com
e11c7eb071 Several "unittest" files : Ensure that the configure result is used when compiling them. 2006-05-10 17:29:28 +02:00
serg@sergbook.mysql.com
f15dde450c a workaround for aclocal-1.8 bug 2006-05-10 11:27:38 -04:00
msvensson@neptunus.(none)
efea82bfba Update results to 5.1 format 2006-05-10 16:58:44 +02:00