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

52093 commits

This branch
This branch
All branches
Author SHA1 Message Date
mhansson/martin@linux-st28.site
6c4eafdae3 Merge linux-st28.site:/home/martin/mysql/src/bug30234/my50-bug30234 
into  linux-st28.site:/home/martin/mysql/src/bug30234/my51-bug30234
 2007-12-03 11:31:44 +01:00
serg@janus.mylan
c3313e2ed1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-12-03 11:27:44 +01:00
mhansson/martin@linux-st28.site
d2c6ed55ef Bug#30234: Unexpected behavior using DELETE with AS and USING 
Anti-patch. This patch undoes the previously pushed patch. It is 
null-merged in versions 5.1 and above since there the original 
patch is still desired.
 2007-12-03 10:08:58 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
658f66e36e Bug#31177: Server variables can't be set to their current values 
additional fixes for 64-bit
 2007-12-03 10:01:56 +01:00
kaa@polly.(none)
4e08609f03 Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-12-02 14:18:27 +03:00
kaa@polly.(none)
3ecbd79c88 Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-12-02 14:14:42 +03:00
kaa@polly.(none)
0e78354baa Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-12-02 14:11:36 +03:00
kaa@polly.(none)
a008572871 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
 2007-12-02 13:51:39 +03:00
kaa@polly.(none)
d905aade4f Windows-specific fixes in floating point tests. 2007-12-02 13:49:12 +03:00
tnurnberg@mysql.com/white.intern.koehntopp.de
2cc07b287a Bug#31177: Server variables can't be set to their current values 
extra 5.1 fixes
 2007-12-02 05:18:34 +01:00
tnurnberg@white.intern.koehntopp.de
f561e8ddf3 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/31177/51-31177
 2007-12-02 03:19:07 +01:00
tnurnberg@white.intern.koehntopp.de
55d6d04df0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/31177/50-31177
 2007-12-02 01:48:43 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
56274466be Bug#31177: Server variables can't be set to their current values 
5.1+ specific fixes (plugins etc.)
 2007-12-01 19:55:06 +01:00
tnurnberg@white.intern.koehntopp.de
9598ea4f45 Merge mysql.com:/misc/mysql/31177/50-31177 
into  mysql.com:/misc/mysql/31177/51-31177
 2007-12-01 15:53:56 +01:00
kaa@polly.(none)
f123625308 Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-12-01 15:46:01 +03:00
kaa@polly.(none)
9699c42ccc Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-12-01 15:40:59 +03:00
kaa@polly.(none)
2a52bb82e4 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-12-01 15:37:25 +03:00
kaa@polly.(none)
c8226d732d Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
 2007-12-01 15:30:01 +03:00
kaa@polly.(none)
55acce7504 Fixed the floating point number tests on Windows. 2007-12-01 15:25:24 +03:00
tnurnberg@white.intern.koehntopp.de
b445a5443e Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/32707/51-32707
 2007-12-01 13:10:59 +01:00
tnurnberg@white.intern.koehntopp.de
3900e55aa8 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/32707/50-32707
 2007-12-01 13:09:16 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
d713527b0c Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  mysql.com:/misc/mysql/32707/41-32707
 2007-12-01 13:07:27 +01:00
kaa@polly.(none)
bcbd426c7f Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-12-01 13:07:07 +03:00
kaa@polly.(none)
a293b12571 Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-12-01 13:00:44 +03:00
kaa@polly.(none)
0f0051e695 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-12-01 12:57:20 +03:00
kaa@polly.(none)
777df295da Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
 2007-12-01 12:50:02 +03:00
kaa@polly.(none)
33125cd40e Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code. 2007-12-01 12:46:25 +03:00
holyfoot/hf@hfmain.(none)
2c89535410 Merge mysql.com:/home/hf/work/mrg/my41-mrg 
into  mysql.com:/home/hf/work/mrg/my50-mrg
 2007-12-01 13:14:49 +04:00
holyfoot/hf@hfmain.(none)
d28aac3f33 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-12-01 13:13:16 +04:00
holyfoot/hf@hfmain.(none)
0b3c91e1f1 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/my50-mrg
 2007-12-01 13:12:31 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
dd4fc01714 Merge bk@192.168.21.1:mysql-4.1-opt 
into  mysql.com:/home/hf/work/mrg/my41-mrg
 2007-12-01 13:09:57 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
9229218d22 merging 2007-12-01 13:07:28 +04:00
kaa@polly.(none)
289abcf583 Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-12-01 10:58:34 +03:00
kaa@polly.(none)
8f13b541a7 Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-12-01 10:53:50 +03:00
kaa@polly.(none)
b994abb997 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-12-01 10:48:41 +03:00
kaa@polly.(none)
109c0439c0 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
 2007-12-01 10:29:43 +03:00
kaa@polly.(none)
7fd9135bb8 Fix for bug #26788 "mysqld (debug) aborts when inserting specific 
numbers into char fields" and bug #12860 "Difference in zero padding of
exponent between Unix and Windows"

Rewrote the code that determines what 'precision' argument should be
passed to sprintf() to fit the string representation of the input number
into the field.
We get finer control over conversion by pre-calculating the exponent, so
we are able to determine which conversion format, 'e' or 'f', will be
used by sprintf().
We also remove the leading zero from the exponent on Windows to make it
compatible with the sprintf() output on other platforms.
 2007-12-01 10:05:59 +03:00
tnurnberg@white.intern.koehntopp.de
4826e97cac Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/32180/51-32180
 2007-12-01 02:02:13 +01:00
tnurnberg@white.intern.koehntopp.de
73b96ecc16 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/32180/50-32180
 2007-12-01 01:59:48 +01:00
istruewing@stella.local
4f112fc9db Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-11-30 23:01:27 +01:00
holyfoot/hf@hfmain.(none)
34de307073 Merge mysql.com:/home/hf/work/mrg/my50-mrg 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-12-01 00:46:44 +04:00
mleich@four.local.lan
94b98f5a0c Merge four.local.lan:/work/trees/mysql-5.0-build-src-clean 
into  four.local.lan:/work/trees/mysql-5.1-build-src-clean
 2007-11-30 19:53:00 +01:00
mleich@four.local.lan
f4faa9fa14 Merge four.local.lan:/work/merge/mysql-5.1-dev 
into  four.local.lan:/work/trees/mysql-5.1-build-src-clean
 2007-11-30 19:43:13 +01:00
mleich@four.local.lan
dba978a785 Merge four.local.lan:/work/trees/mysql-4.1-build-src-clean 
into  four.local.lan:/work/trees/mysql-5.0-build-src-clean
 2007-11-30 19:30:48 +01:00
holyfoot/hf@hfmain.(none)
ad52a590cf Merge mysql.com:/home/hf/work/mrg/my41-mrg 
into  mysql.com:/home/hf/work/mrg/my50-mrg
 2007-11-30 22:29:34 +04:00
holyfoot/hf@hfmain.(none)
83e0fef847 Merge mysql.com:/home/hf/work/32624/my50-32624 
into  mysql.com:/home/hf/work/mrg/my50-mrg
 2007-11-30 22:28:23 +04:00
istruewing@stella.local
b6098fc940 Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-11-30 19:28:17 +01:00
mleich@four.local.lan
586a132744 Merge four.local.lan:/work/merge/mysql-5.0-dev 
into  four.local.lan:/work/trees/mysql-5.0-build-src-clean
 2007-11-30 19:27:30 +01:00
holyfoot/hf@hfmain.(none)
bea42da135 Merge mysql.com:/home/hf/work/32374/my50-32374 
into  mysql.com:/home/hf/work/mrg/my50-mrg
 2007-11-30 22:26:48 +04:00
holyfoot/hf@hfmain.(none)
a756bfd408 Merge mysql.com:/home/hf/work/31890/my51-31890 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-11-30 22:25:03 +04:00