mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43944 commits 2784 branches 343 tags 1.6 GiB
Commit graph

43944 commits

This branch
This branch
All branches
Author SHA1 Message Date
kent@mysql.com/kent-amd64.(none)
47c692ec02 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-03-02 19:22:53 +01:00
kent@mysql.com/kent-amd64.(none)
b30a4df3f5 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.0
 2007-03-02 19:21:11 +01:00
jonas@perch.ndb.mysql.com
53e7320408 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-02 19:11:56 +01:00
joerg@trift2.
7d0ec0bee3 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-03-02 19:09:14 +01:00
jonas@eel.(none)
6a52626da9 ndb - bug#15632 
arg...also fix starting node...(version 6)
 2007-03-02 19:08:58 +01:00
joerg@trift2.
6ac5fa4c18 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-03-02 19:04:15 +01:00
jonas@eel.(none)
e8cc3c4f1f ndb - bug#15632 
fix testNodeRestart -n Bug15632
  handle version > 5
 2007-03-02 18:47:30 +01:00
gkodinov/kgeorge@magare.gmz
6274ee84b3 fixed win32 warnings 2007-03-02 19:32:46 +02:00
gkodinov/kgeorge@macbook.gmz
76995281a3 fixed win32 warning 2007-03-02 19:27:32 +02:00
joerg@trift2.
a91f84eb09 Merge trift2.:/MySQL/M50/manpages-5.0 
into  trift2.:/MySQL/M51/manpages-5.1
 2007-03-02 17:15:13 +01:00
joerg@trift2.
9cdd21515b Merge trift2.:/MySQL/M41/manpages-4.1 
into  trift2.:/MySQL/M50/manpages-5.0
 2007-03-02 17:01:24 +01:00
gkodinov/kgeorge@magare.gmz
cf917cc514 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B19342-5.0-opt
 2007-03-02 17:37:44 +02:00
joerg@trift2.
57bc6066e3 Merge trift2.:/MySQL/M40/manpages-4.0 
into  trift2.:/MySQL/M41/manpages-4.1
 2007-03-02 16:34:29 +01:00
joerg@trift2.
6158657090 More man pages for the RPMs. 2007-03-02 16:32:27 +01:00
joerg@trift2.
c1c22df202 Another man page in the RPMs. 2007-03-02 16:30:22 +01:00
gkodinov/kgeorge@magare.gmz
225575ce47 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B19342-5.0-opt
 2007-03-02 16:28:41 +02:00
gkodinov/kgeorge@macbook.gmz
be75593165 Bug #19342: 
Several problems here :
 1. The conversion to double of an hex string const item
 was not taking into account the unsigned flag.
 
 2. IN was not behaving in the same was way as comparisons
 when performed over an INT/DATE/DATETIME/TIMESTAMP column
 and a constant. The ordinary comparisons in that case 
 convert the constant to an INTEGER value and do int 
 comparisons. Fixed the IN to do the same.
 
 3. IN is not taking into account the unsigned flag when 
 calculating <expr> IN (<int_const1>, <int_const2>, ...).
 Extended the implementation of IN to store and process
 the unsigned flag for its arguments.
 2007-03-02 16:25:56 +02:00
tnurnberg@sin.intern.azundris.com
36a5e0b3df Merge mysql.com:/home/tnurnberg/21103/50-21103 
into  mysql.com:/home/tnurnberg/21103/51-21103
 2007-03-02 15:25:06 +01:00
tnurnberg@mysql.com/sin.intern.azundris.com
f37267bb3c Bug #21103: DATE column not compared as DATE 
If we compare two items A and B, with B being (a constant) of a
larger type, then A gets promoted to B's type for comparison if
it's a constant, function, or CAST() column, but B gets demoted
to A's type if A is a (not explicitly CAST()) column. This is
counter-intuitive and not mandated by the standard.
 
Disabling optimisation where it would be lossy so field value
will properly get promoted and compared as binary string (rather
than as integers).
 2007-03-02 15:23:13 +01:00
msvensson@pilot.blaudden
1c5c12ac5e Add hint about using --help to see what options are available 2007-03-02 15:21:01 +01:00
gkodinov/kgeorge@magare.gmz
8c1e9d0cb4 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26537-5.0-opt
 2007-03-02 16:18:00 +02:00
joerg@trift2.
40124c59fa Merge trift2.:/MySQL/M50/manpages-5.0 
into  trift2.:/MySQL/M51/manpages-5.1
 2007-03-02 14:23:12 +01:00
joerg@trift2.
942822321c Merge trift2.:/MySQL/M41/manpages-4.1 
into  trift2.:/MySQL/M50/manpages-5.0
 2007-03-02 14:20:43 +01:00
joerg@trift2.
783e907f59 Merge trift2.:/MySQL/M40/manpages-4.0 
into  trift2.:/MySQL/M41/manpages-4.1
 2007-03-02 14:17:04 +01:00
joerg@trift2.
ce9452152e Add man pages for NDB to the RPMs. 2007-03-02 14:13:13 +01:00
joerg@trift2.
dfce4c8ffd Add the man pages for NDB to the RPMs. 2007-03-02 14:08:32 +01:00
joerg@trift2.
3e2e58d60e Add the man pages for NDB to the RPMs. 2007-03-02 14:05:43 +01:00
joerg@trift2.
1775f82d58 Add missing man pages to the RPMs. 2007-03-02 14:03:28 +01:00
kostja@bodhi.local
3f8c35d94b Freeze the number of conflicts. We should not introduce any more 
conflicts without proper analysis and documentation of the nature of
the conflict.
 2007-03-02 15:05:16 +03:00
kostja@bodhi.local
89bd002cc8 Rename a macro to better reflect the action taken. 2007-03-02 14:29:51 +03:00
ramil/ram@ramil.myoffice.izhnet.ru
363b0b6ff1 Merge mysql.com:/home/ram/work/b23616/b23616.5.0 
into  mysql.com:/home/ram/work/b23616/b23616.5.1
 2007-03-02 15:13:28 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f165316cfc after merge fix (bug #26038) 
Item_func_geometry_from_text::val_str() should set null_value
in case of wrong data.
 2007-03-02 15:09:44 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4a5dd6956d Merge mysql.com:/home/ram/work/b23616/b23616.4.1 
into  mysql.com:/home/ram/work/b23616/b23616.5.0
 2007-03-02 15:09:20 +04:00
jonas@perch.ndb.mysql.com
0ec5020ebd Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-02 11:52:16 +01:00
jonas@perch.ndb.mysql.com
f05e5e8c4e ndb - 
fix printout
  crashes testSystemRestart -n SR_UNDO
 2007-03-02 11:48:14 +01:00
jonas@perch.ndb.mysql.com
38814b22dd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-03-02 11:41:21 +01:00
evgen@sunlight.local
629aa8071d sql_base.cc: 
Post fix for bug#25122.
 2007-03-02 13:25:41 +03:00
gkodinov/kgeorge@magare.gmz
4a6efcd664 Bug #26537: item_unhex() was not expected 
to return NULL for non-NULL arguments.
This is not the case as it can return NULL
for invalid hexidecimal strings.
Fixed by setting the maybe_null flag.
 2007-03-02 12:14:50 +02:00
rafal@quant.(none)
d445d5e4cc Removing global events_till_disconnect variable as it is replaced by a member of 
master info structure.
 2007-03-02 10:35:04 +01:00
Kristofer.Pettersson@naruto.
cba58e5910 Merge BUG: Windows target won't compile. 
- winsock2.h must be included before windows.h
 2007-03-02 09:04:23 +01:00
gni/root@dev3-221.dev.cn.tlan
d4b29bf4b2 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug19378
 2007-03-02 15:32:24 +08:00
gni/root@dev3-221.dev.cn.tlan
67a0f056ab Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug19378 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug19378
 2007-03-02 15:08:01 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
8458d50f05 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug24568-5.0-ndb-bj
 2007-03-02 12:11:49 +08:00
malff/marcsql@weblab.(none)
2b1a04e7b9 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-26093
 2007-03-01 20:08:58 -07:00
malff/marcsql@weblab.(none)
6cf49ef065 Manual merge 2007-03-01 20:04:49 -07:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
2248cd3d3e bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected 
when merge from 5.0 to 5.1, update a function call in testScanFilter.cpp 
beacuase the function's definition is changed from 5.0 to 5.1
 2007-03-02 11:03:16 +08:00
tomas@poseidon.mysql.com
65a0ee5f8c Merge poseidon.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-02 09:38:03 +07:00
malff/marcsql@weblab.(none)
348cf79bf7 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-26093 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-26093-merge
 2007-03-01 19:22:43 -07:00
malff/marcsql@weblab.(none)
ad45f0168d Bug#26093 (SELECT BENCHMARK() for SELECT statements does not produce valid 
results)

Before this fix, the function BENCHMARK() would fail to evaluate expressions
like "(select avg(a) from t1)" in debug builds (with an assert),
or would report a time of zero in non debug builds.

The root cause is that evaluation of DECIMAL_RESULT expressions was not
supported in Item_func_benchmark::val_int().

This has been fixed by this change.
 2007-03-01 19:20:47 -07:00
tomas@poseidon.mysql.com
e0ba5ee1ab Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-02 09:17:17 +07:00