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

38272 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
03ead53d56 Merge neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-26 16:30:50 +02:00
msvensson@neptunus.(none)
5481659f6e Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-26 16:05:11 +02:00
msvensson@neptunus.(none)
422674c73f Update patch that restores slave databases from snapshots before start for 5.1 2006-09-26 16:01:16 +02:00
msvensson@neptunus.(none)
ea91c010de Merge neptunus.(none):/home/msvensson/mysql/bug18969/my50-bug18969 
into  neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969
 2006-09-26 14:40:03 +02:00
msvensson@neptunus.(none)
dc02f761e5 Bug#18969 race condition involving slave and mysqltest. was rpl_insert_id test case fails 
- As the slaves are restarted for each testcase, take the opportunity to restore their databases to a known state with the help of the snapshot(s)
 - Count max number of slaves used in testcases
 - Use copy_install_db to speed up "Installing db" phase
 2006-09-26 13:49:42 +02:00
msvensson@neptunus.(none)
4ee6e94fde Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-25 20:45:27 +02:00
msvensson@neptunus.(none)
0be1bf6eac Return from function 'collect_one_test_case' as sson it's detected that testcase should be skipped 2006-09-25 20:28:40 +02:00
msvensson@neptunus.(none)
40a655b1b8 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-25 20:18:01 +02:00
msvensson@neptunus.(none)
53b3faf783 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-09-25 20:03:22 +02:00
msvensson@neptunus.(none)
5edd58b14c Bug#18888 Trying to overwrite sql/lex_hash.h during build 
-Backport fix for bug19738 to 4.1
 2006-09-25 20:01:39 +02:00
msvensson@neptunus.(none)
bcdecd96b7 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2006-09-25 16:46:37 +02:00
msvensson@neptunus.(none)
64a64d0fbf Import yaSSL version 1.4.0 2006-09-25 16:40:29 +02:00
kaa@polly.local
1027446d12 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-25 13:30:19 +04:00
kaa@polly.local
059b026dc1 Merge polly.local:/tmp/22129/bug22129/my51-bug22129 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-25 13:23:33 +04:00
kaa@polly.local
c7c9cdf2d1 Merge polly.local:/tmp/22129/bug22129/my50-bug22129 
into  polly.local:/tmp/22129/bug22129/my51-bug22129
 2006-09-25 12:52:01 +04:00
kaa@polly.local
781879adf9 Fixed broken 'strict' test which relied on incorrect behaviour of my_strtod() (fixed in bug #22129) 2006-09-25 12:50:32 +04:00
cmiller@zippy.cornsilk.net
161fea4ac4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-23 09:51:20 -04:00
lars/lthalmann@dl145k.mysql.com
60e178bb73 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1
 2006-09-23 08:45:26 +02:00
lars/lthalmann@dl145k.mysql.com
bab374162f Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-23 07:54:40 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
7a761a2545 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-23 07:37:41 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
7ce96bb579 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-23 07:12:00 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
80dadacb03 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-09-23 07:11:32 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
bbbb3901af Disabling test case 2006-09-23 07:07:29 +02:00
lars/lthalmann@dl145h.mysql.com
b8556c82a9 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-23 06:06:06 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
bbf84d6b9e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-23 06:00:50 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
7e45d80362 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-09-23 05:58:48 +02:00
mskold/marty@linux.site
5e60232da9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-22 21:14:58 +02:00
kaa@polly.local
b98475077c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-22 20:01:51 +04:00
kaa@polly.local
c06dd5cdf0 Merge polly.local:/tmp/22129/bug22129/my50-bug22129 
into  polly.local:/tmp/22129/bug22129/my51-bug22129
 2006-09-22 19:42:27 +04:00
kaa@polly.local
6fd25f611a Merge polly.local:/tmp/22129/bug22129/my41-bug22129 
into  polly.local:/tmp/22129/bug22129/my50-bug22129
 2006-09-22 19:40:07 +04:00
joerg@trift2.
4525ea4bfb Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-09-22 17:24:06 +02:00
kaa@polly.local
1530b51d8f Fixed bug #22129: A small double precision number becomes zero 
Better checks for underflow/overflow
 2006-09-22 19:23:58 +04:00
georg@lmy002.wdf.sap.corp
67a701003c Fix for bug #19121: Windows incompatible udf_example 2006-09-22 14:42:43 +02:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
724ea113f8 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
 2006-09-22 12:39:29 +03:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
0c788a30dd BUG#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage 
local file slipped into a previous commit, fixing ignore.
 2006-09-22 11:08:47 +03:00
msvensson@neptunus.(none)
015d8409a7 Fix windows and aix compile problem 
- Variables must be declared first in each block
 2006-09-22 09:00:23 +02:00
georg@lmy002.wdf.sap.corp
ca00ba4991 Added build rule for mysql_upgrade.exe 2006-09-22 07:38:24 +02:00
knielsen@bk-internal.mysql.com
ec2e007a32 Merge bk-internal.mysql.com:/tmp/knielsen/mysql-5.0-maint 
into  bk-internal.mysql.com:/tmp/knielsen/mysql-5.1-new-maint
 2006-09-21 21:50:25 +02:00
knielsen@bk-internal.mysql.com
3491d37b35 After-merge fix (null merge). 2006-09-21 21:45:42 +02:00
knielsen@bk-internal.mysql.com
3c17386d77 Merge knielsen.mysql.internal:/usr/local/mysql/mysql-4.1 
into  bk-internal.mysql.com:/tmp/knielsen/mysql-5.0-maint
 2006-09-21 21:40:07 +02:00
msvensson@shellback.(none)
0dbbe51384 Fix Solaris 10 compile failure 
- Void function can't return a value
 2006-09-21 20:37:35 +02:00
msvensson@shellback.(none)
fe0cfacf35 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-21 20:31:35 +02:00
msvensson@shellback.(none)
c898d8e144 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-21 20:28:12 +02:00
joerg@trift2.
17218bd732 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-09-21 20:03:39 +02:00
mats@romeo.(none)
3b9b6e6544 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl
 2006-09-21 18:11:35 +02:00
mats@romeo.(none)
f5b8614fc7 BUG#22550 (Replication of BIT column failing): 
Using move_field_offset() to move field pointer to other record before
calling pack()/unpack().
 2006-09-21 18:05:02 +02:00
joerg@trift2.
d1f0a57a6d Add a dummy file for "Docs/manual.chm" as we need it for "make dist" to work. 2006-09-21 17:38:42 +02:00
istruewing@chilla.local
64fbabc551 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-toteam
 2006-09-21 17:18:20 +02:00
joerg@trift2.
3acb6778dd Merge trift2.:/MySQL/M50/extract1-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-09-21 16:48:31 +02:00
georg@lmy002.wdf.sap.corp
8a7875fd53 added udf_example.def for make dist 2006-09-21 15:56:14 +02:00