mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35665 commits 2780 branches 343 tags 1.6 GiB
Commit graph

35665 commits

This branch
This branch
All branches
Author SHA1 Message Date
pekka@clam.ndb.mysql.com
ea794df45a ndb - bug#20751 : report also composite op in merge 2006-07-03 12:13:57 +02:00
mikael@dator5.(none)
d5bb513021 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  dator5.(none):/home/pappa/bug17138
 2006-07-01 19:47:24 -04:00
mikael@dator5.(none)
55109a802d Merge dator5.(none):/home/pappa/bug20583 
into  dator5.(none):/home/pappa/bug17138
 2006-07-01 00:28:04 -04:00
mikael@dator5.(none)
9e56572e5c Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug20583
 2006-07-01 00:22:25 -04:00
mikael@dator5.(none)
5853823bb2 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug17138
 2006-07-01 00:19:23 -04:00
mikael@dator5.(none)
4e390d711a BUG#17138: Crashes in stored procedure 
Last round of review fixes
 2006-07-01 00:01:37 -04:00
evgen@moonbone.local
a3deb94518 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into moonbone.local:/work/merge-5.1
 2006-07-01 05:59:26 +04:00
evgen@moonbone.local
1459784aba Reverted wrong bug fix (Bug#11228) 2006-07-01 01:37:20 +04:00
knielsen@devsrv-b.mysql.com
79ebe92208 Merge bk-internal:/home/bk/mysql-5.1 
into  mysql.com:/data0/knielsen/tmp-5.1
 2006-06-30 18:20:45 +02:00
knielsen@rt.int.sifira.dk
dcd9132fe7 Merge mysql.com:/usr/local/mysql/mysql-5.1-bindist 
into  mysql.com:/usr/local/mysql/tmp-5.1
 2006-06-30 15:21:45 +02:00
knielsen@mysql.com
5b1c92244c Add a script scripts/make_win_bin_dist, used to generate a Windows 
binary disctribution for Falcon.
 2006-06-30 15:15:20 +02:00
evgen@moonbone.local
a989f7261e Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 
into moonbone.local:/work/merge-5.1
 2006-06-30 16:10:26 +04:00
evgen@moonbone.local
adbd5fb185 Manual merge 2006-06-30 16:09:14 +04:00
petr@owlet.
b655968123 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/trees/5.1-team
 2006-06-30 11:17:53 +04:00
petr@mysql.com
c95ad6158a cleanup 2006-06-30 08:11:51 +04:00
petr@mysql.com
157cc569a8 fix test failures 2006-06-30 03:28:58 +04:00
monty@hasky.mysql.fi
0b00ae6bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-29 23:41:33 +03:00
monty@mysql.com
8eb9c06d70 Replaced assert with argument checking, as rpl_ndb_UUID caused slave to fail on x86 64 bit 
(It failed even if test was marked as skipped)
 2006-06-29 23:22:55 +03:00
tomas@poseidon.ndb.mysql.com
3b3dde6f4e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-29 22:13:19 +02:00
tomas@poseidon.ndb.mysql.com
5d67b05203 corrected merge error 2006-06-29 22:11:29 +02:00
tomas@poseidon.ndb.mysql.com
9d902d4cf8 manual merge 2006-06-29 21:25:37 +02:00
tomas@poseidon.ndb.mysql.com
6fb6a1058c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-29 21:14:29 +02:00
tomas@poseidon.ndb.mysql.com
6f318d1658 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-06-29 21:05:43 +02:00
tomas@poseidon.ndb.mysql.com
87460ec76a Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error 2006-06-29 20:55:21 +02:00
petr@owlet.
35b7eb7e22 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/trees/5.1-team
 2006-06-29 21:48:53 +04:00
petr@mysql.com
4d76c28caa Fix Bug#20692 rpl_* tests failure on hpux 2006-06-29 21:43:52 +04:00
tomas@poseidon.ndb.mysql.com
42dfb7a88d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-29 17:26:22 +02:00
stewart@willster.(none)
c3010c2497 Merge mysql.com:/home/stewart/Documents/MySQL/5.1/bug17928 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/ndb
 2006-06-29 22:36:27 +10:00
lars@dl145k.mysql.com
f3d8d60259 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-29 14:24:02 +02:00
tomas@poseidon.ndb.mysql.com
019532a544 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-29 13:26:39 +02:00
tomas@poseidon.ndb.mysql.com
0822e24679 fixed too small requestInfo in signal 
+ adopted signal to be as close as possible to 5.1...
 2006-06-29 13:01:54 +02:00
tomas@poseidon.ndb.mysql.com
0d22cc662b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-29 10:48:31 +02:00
gkodinov@mysql.com
3447374939 Merge mysql.com:/home/kgeorge/mysql/4.1/warnings 
into  mysql.com:/home/kgeorge/mysql/5.0/warnings
 2006-06-29 10:46:30 +03:00
gkodinov@mysql.com
9dbb09182b Merge mysql.com:/home/kgeorge/mysql/4.1/teamclean 
into  mysql.com:/home/kgeorge/mysql/4.1/warnings
 2006-06-29 10:36:08 +03:00
monty@mysql.com
3f22bc07c6 Fixed failing test rpl_ndb_auto_inc.test 
Mark events_stress.test as 'big' as it's very slow on some machines
 2006-06-29 03:24:33 +03:00
monty@narttu.mysql.fi
7b0f8635ae Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-29 00:09:53 +03:00
evgen@moonbone.local
3ad6ad75e1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into moonbone.local:/home/evgen/mysql-5.1-new
 2006-06-28 21:51:19 +04:00
monty@narttu.mysql.fi
91c3e28d77 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-28 20:03:46 +03:00
acurtis@ltamd64.xiphis.org
9d99e180f5 Merge xiphis.org:/home/antony/work2/p4-bug12096.3 
into  xiphis.org:/home/antony/work2/p4-bug12096.3-merge
 2006-06-28 10:02:47 -07:00
evgen@moonbone.local
82369c4e65 Manual merge 2006-06-28 19:34:04 +04:00
tomas@poseidon.ndb.mysql.com
470087cb58 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-28 17:20:01 +02:00
tomas@poseidon.ndb.mysql.com
63c72dc02b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-28 17:12:18 +02:00
lars@dl145k.mysql.com
315ae8f4cc Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-28 16:56:15 +02:00
lars@dl145k.mysql.com
d4f7943594 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-28 16:44:54 +02:00
monty@mysql.com
500dd048b9 Added -DHAVE_MUTEX_THREAD_ONLY to fix that bdb doesn't crash with "unable to initialize mutex" 2006-06-28 17:23:54 +03:00
lars@mysql.com
6036c30b57 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-28 16:18:57 +02:00
lars@dl145k.mysql.com
00fc05ff1b Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
 2006-06-28 15:34:09 +02:00
gkodinov@mysql.com
96ceb6c234 gcc 4.1 linux warning fixes backported from 5.0. 2006-06-28 16:28:29 +03:00
lars@mysql.com
c75584d8d9 Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
 2006-06-28 15:27:25 +02:00
knielsen@mysql.com
10abc3e244 BUG#20739. 
In the Windows build files, the "Max nt" configuration for some reason
had the mysql_client_test project disabled. Enable it.
 2006-06-28 15:15:49 +02:00