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

47326 commits

This branch
This branch
All branches
Author SHA1 Message Date
df@pippilotta.erinye.com
edd001475f Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-15 09:47:25 +02:00
georg@bing.site
7c02fbd147 Added yassl and taocrypt sources to mysqlclientlib 2007-06-15 09:18:58 +02:00
joerg@trift2.
5b22180586 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-14 21:45:39 +02:00
joerg@trift2.
9ab46d0088 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-14 21:34:41 +02:00
joerg@trift2.
b5c9cab55c Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-14 21:27:33 +02:00
joerg@trift2.
ae1ff2e84c Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-14 21:25:10 +02:00
joerg@trift2.
d097ee804c Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-14 21:17:12 +02:00
holyfoot/hf@hfmain.(none)
e6a478dee6 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-06-14 23:03:12 +05:00
holyfoot/hf@hfmain.(none)
a877145db8 Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-06-14 23:02:28 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
160add01a5 fix the binlog-stm_ps.test for the embedded-server 2007-06-14 20:33:57 +05:00
holyfoot/hf@hfmain.(none)
eabb672080 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-06-14 20:30:08 +05:00
gkodinov/kgeorge@magare.gmz
16a7a45bdc Merge magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.1-opt
 2007-06-14 16:52:30 +03:00
gkodinov/kgeorge@magare.gmz
37deabacb2 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-merge-5.0-opt
 2007-06-14 16:43:14 +03:00
gkodinov/kgeorge@magare.gmz
78f477c9d9 corrected valgrind problems for bug 28505 and 28934 2007-06-14 15:38:52 +03:00
holyfoot/hf@hfmain.(none)
a6c221d01e Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-06-14 16:45:14 +05:00
holyfoot/hf@hfmain.(none)
1e9373fd60 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-06-14 16:42:43 +05:00
holyfoot/hf@hfmain.(none)
8ccc50b303 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-06-14 16:41:10 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
79062df3fb Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
 2007-06-14 16:35:46 +05:00
holyfoot/hf@hfmain.(none)
76e0a0768a Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-06-14 16:35:20 +05:00
gkodinov/kgeorge@magare.gmz
2372767bbd Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28991-5.1-opt
 2007-06-14 12:54:52 +03:00
gkodinov/kgeorge@magare.gmz
56290f2690 Bug #28991: rpl_events failure in pushbuild 
In tests waiting on a timeout is not deterministic enough
to make sure that an event actually finished executing.
Fixed the test by waiting in a loop and checking the effect
that the event is supposed to produce.
 2007-06-14 12:53:13 +03:00
df@pippilotta.erinye.com
02f5ba1076 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-13 19:29:13 +02:00
df@pippilotta.erinye.com
f58ca7e057 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-13 19:24:46 +02:00
df@pippilotta.erinye.com
35413f161a fix. 2007-06-13 19:23:13 +02:00
df@pippilotta.erinye.com
c8ea368b80 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-13 19:20:14 +02:00
df@pippilotta.erinye.com
6db1887a5c fix make_win_bin_dist typo 2007-06-13 19:19:11 +02:00
igor@olga.mysql.com
20ad515003 Fixed bug #28980: the result of ROUND(<decimal expr>,<int column>) 
was erroneously converted to double, while the result of
ROUND(<decimal expr>, <int literal>) was preserved as decimal.
As a result of such a conversion the value of ROUND(D,A) could
differ from the value of ROUND(D,val(A)) if D was a decimal expression.

Now the result of the ROUND function is never converted to 
double if the first argument is decimal.
 2007-06-13 09:32:36 -07:00
mhansson@dl145s.mysql.com
b87dbfe949 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/users/mhansson/mysql/autopush/5.1o-bug27634
 2007-06-13 16:01:16 +02:00
df@pippilotta.erinye.com
990ac2cc3f Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-13 15:39:04 +02:00
df@pippilotta.erinye.com
40f8aa1fd6 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-13 15:36:47 +02:00
df@pippilotta.erinye.com
23ce2ec53c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-13 15:34:30 +02:00
df@pippilotta.erinye.com
9dc622e540 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
 2007-06-13 15:13:54 +02:00
df@pippilotta.erinye.com
1eae867a4f Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-13 15:11:58 +02:00
df@pippilotta.erinye.com
a98dca4c87 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-13 15:09:49 +02:00
joerg@trift2.
b3917e94fa Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-13 15:04:21 +02:00
joerg@trift2.
a4494a1b81 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-13 14:57:31 +02:00
joerg@trift2.
f004ab37ef Merge trift2.:/MySQL/M50/merge-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-13 14:52:45 +02:00
joerg@trift2.
4d8632f2e0 Merge trift2.:/MySQL/M51/merge-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-13 14:43:57 +02:00
joerg@trift2.
536ea333d8 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-13 14:36:18 +02:00
df@pippilotta.erinye.com
5ce49c284f Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-13 14:24:31 +02:00
joerg@trift2.
4ed489d66b Merge trift2.:/MySQL/M50/merge-5.0 
into  trift2.:/MySQL/M51/merge-5.1
 2007-06-13 14:23:09 +02:00
joerg@trift2.
36adff6d0d Merge trift2.:/MySQL/M41/tmp-4.1 
into  trift2.:/MySQL/M50/merge-5.0
 2007-06-13 13:55:42 +02:00
joerg@trift2.
a4a2c7202c Merge trift2.:/MySQL/M41/tmp-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-13 13:35:04 +02:00
joerg@trift2.
018a5d403b sql/item_func.cc 
Improved check for thread identity in the "embedded" case,
    provided by Monty.
    
    This finishes the fixes for bug#27078.
 2007-06-13 13:33:00 +02:00
df@pippilotta.erinye.com
6de0de60cf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-13 13:19:43 +02:00
df@pippilotta.erinye.com
750b37a888 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-13 13:17:29 +02:00
df@pippilotta.erinye.com
d32bdf767e Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-13 13:16:18 +02:00
df@pippilotta.erinye.com
51672e9598 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
 2007-06-13 12:58:56 +02:00
df@pippilotta.erinye.com
d735865d0c Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-13 12:56:43 +02:00
df@pippilotta.erinye.com
7ed3a78331 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-13 12:37:10 +02:00