Commit graph

43886 commits

Author SHA1 Message Date
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9900d2f213 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b23616/b23616.5.0
2007-03-05 12:04:37 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
b69493027e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b23616/b23616.5.1
2007-03-05 11:57:51 +04:00
igor@olga.mysql.com
08efa4e0ea Fixed bug #26560.
The flag alias_name_used was not set on for the outer references
in subqueries. It resulted in replacement of any outer reference
resolved against an alias for a full field name when the frm 
representation of a view with a subquery was generated. 
If the subquery and the outer query referenced the same table in
their from lists this replacement effectively changed the meaning
of the view and led to wrong results for selects from this view. 

Modified several functions to ensure setting the right value of
the alias_name_used flag for outer references resolved against
aliases.
2007-03-04 19:54:35 -08:00
evgen@sunlight.local
629c12316d Bug#25126: Wrongly resolved field leads to a crash.
When the ORDER BY clause gets fixed it's allowed to search in the current
item_list in order to find aliased fields and expressions. This is ok for a
SELECT but wrong for an UPDATE statement. If the ORDER BY clause will
contain a non-existing field which is mentioned in the UPDATE set list
then the server will crash due to using of non-existing (0x0) field.

When an Item_field is getting fixed it's allowed to search item list for
aliased expressions and fields only for selects.
2007-03-04 00:47:42 +03:00
msvensson@pilot.blaudden
be1e948543 Merge 192.168.0.10:mysql/my50-m-bug18431
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-03 12:14:36 +01:00
tnurnberg@mysql.com/sin.intern.azundris.com
7217d20725 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/tnurnberg/21103/50-21103
2007-03-03 01:00:30 +01:00
tnurnberg@sin.intern.azundris.com
edf3519b23 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/tnurnberg/21103/51-21103
2007-03-03 00:56:21 +01:00
kent@kent-amd64.(none)
73b1745ede Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-02 20:01:02 +01:00
kent@mysql.com/kent-amd64.(none)
4889fdfafd Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-02 19:59:36 +01:00
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
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