hezx@mail.hezx.com
ede9a2629b
fix failed tests
2008-01-21 22:31:31 +08:00
hezx@mail.hezx.com
d60bc6400b
Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.0
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.1
2008-01-21 14:10:34 +08:00
kaa@kaamos.(none)
fa20bb5afe
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-01-20 13:50:26 +03:00
kaa@kaamos.(none)
6619db580d
Fixed a PushBuild failure of the system_mysql_db test caused by the lack
...
of cleanups in the test case for bug33794.
2008-01-20 13:46:55 +03:00
anozdrin/alik@ibm.
e5ed653e16
Fix merge.
2008-01-20 00:59:24 +03:00
anozdrin/alik@ibm.
58f76a036d
Merge ibm.:/home/alik/Documents/MySQL/devel/5.0-rt
...
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.0-rt
2008-01-20 00:39:14 +03:00
anozdrin/alik@ibm.
baf5f73853
Merge ibm.:/home/alik/Documents/MySQL/devel/5.1
...
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.1
2008-01-19 22:32:48 +03:00
kaa@kaamos.(none)
6f451bf228
Post-merge fixes.
2008-01-19 22:13:42 +03:00
anozdrin/alik@ibm.
3cd05f003e
Merge ibm.:/home/alik/Documents/MySQL/devel/5.0
...
into ibm.:/home/alik/Documents/MySQL/devel/5.0-rt-merged-5.0
2008-01-19 21:28:21 +03:00
kaa@kaamos.(none)
e91bf15d5c
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-01-19 21:09:22 +03:00
dfischer/mysqldev@mysql.com/production.mysql.com
c6a01870bc
Raise version number after cloning 5.1.23-rc
2008-01-19 12:39:49 +01:00
mhansson@lamia.dupka
e3e370dd9d
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into lamia.dupka:/home/mhansson/my50-bug33143-again-pushee
2008-01-18 22:45:14 +02:00
sergefp@mysql.com
d56ac2f37b
BUG#33794 "MySQL crashes executing specific query":
...
The problem occurred when one had a subquery that had an equality X=Y where
Y referred to a named select list expression from the parent select. MySQL
crashed when trying to use the X=Y equality for ref-based access.
Fixed by allowing non-Item_field items in the described case.
2008-01-18 22:50:36 +03:00
mhansson/martin@linux-st28.site
f8fb6e930a
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
...
into linux-st28.site:/home/martin/mysql/src/bug33143/my51-bug33143-pushee
2008-01-17 18:36:04 +01:00
mhansson/martin@linux-st28.site
2067dfe474
Merge linux-st28.site:/home/martin/mysql/src/bug33143/my50-bug33143-again
...
into linux-st28.site:/home/martin/mysql/src/bug33143/my51-bug33143
2008-01-17 18:22:55 +01:00
mhansson/martin@linux-st28.site
7207d3ce21
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bug33143/my50-bug33143-again-pushee
2008-01-17 18:15:53 +01:00
kostja@dipika.(none)
8aa978352e
A minor cleanup.
2008-01-16 16:44:07 +03:00
hezx@mail.hezx.com
5502885c14
Merge zhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/merge-51
2008-01-15 10:37:18 +08:00
sven@riska.(none)
2cd6432da3
Merge riska.(none):/home/sven/bkgca/5.1-new-rpl
...
into riska.(none):/home/sven/bk/b27779-old_row_events/5.1-new-rpl
2008-01-14 16:48:04 +01:00
mhansson/martin@linux-st28.site
effe27e350
Bug#33143: Incorrect ORDER BY for ROUND()/TRUNCATE() result
...
The ROUND(X, D) function would change the Item::decimals field during
execution to achieve the effect of a dynamic number of decimal digits.
This caused a series of bugs:
Bug #30617:Round() function not working under some circumstances in InnoDB
Bug #33402:ROUND with decimal and non-constant cannot round to 0 decimal places
Bug #30889:filesort and order by with float/numeric crashes server
Fixed by never changing the number of shown digits for DECIMAL when
used with a nonconstant number of decimal digits.
2008-01-14 16:16:36 +01:00
hezx@mail.hezx.com
fff3c90e9f
Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/mysql-5.1-new-rpl
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/merge-51
2008-01-14 17:59:08 +08:00
hezx@mail.hezx.com
cdc67c13e8
fix for versional test
2008-01-14 17:54:23 +08:00
hezx@mail.hezx.com
41bb6f988c
Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/mysql-5.1-new-rpl
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/merge-51
2008-01-14 15:41:28 +08:00
hezx@mail.hezx.com
2720b76c4a
Fix for versional test
...
Mask binlog positions, error, warning and other information that are not significant for the test
2008-01-14 15:38:02 +08:00
mkindahl@dl145h.mysql.com
07d38435ea
Post-merge fixes to make tests pass.
2008-01-13 22:13:17 +01:00
mhansson@lamia.dupka
8eb74b1f5f
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into lamia.dupka:/home/mhansson/my50-bug31797-pushee
2008-01-12 18:59:05 +02:00
davi@mysql.com/endora.local
30267c7750
Post merge fix for BUG 33728
2008-01-11 21:34:23 -02:00
davi@endora.local
ec5c26f8d0
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-01-11 20:42:07 -02:00
davi@mysql.com/endora.local
e88edf6ab1
Bug#33728 Atomic builtins
...
Use compiler provided atomic builtins as a 'backend' for
MySQL's atomic primitives. The builtins are available on
a handful of platforms and compilers.
2008-01-11 20:34:36 -02:00
mhansson@lamia.dupka
deacf8b37f
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into lamia.dupka:/home/mhansson/my51-bug31797-pushee
2008-01-11 23:09:34 +02:00
mhansson/martin@linux-st28.site
481a96930c
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
...
into linux-st28.site:/home/martin/mysql/src/bug31797/my51-bug31797-pushee
2008-01-11 19:39:28 +01:00
mhansson/martin@linux-st28.site
afc6a369f3
Merge linux-st28.site:/home/martin/mysql/src/bug31797/my50-bug31797
...
into linux-st28.site:/home/martin/mysql/src/bug31797/my51-bug31797
2008-01-11 19:13:07 +01:00
igor@olga.mysql.com
947715c228
Merge olga.mysql.com:/home/igor/mysql-5.1-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug33697
2008-01-11 10:12:29 -08:00
igor@olga.mysql.com
b85ffdb5d5
Fixed bug #33697 .
...
When the function test_if_skip_sort_order prefers index backward scan
to ref access the corresponding access functions must be set accordingly.
2008-01-11 10:05:34 -08:00
mhansson/martin@linux-st28.site
e24109c6d1
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bug31797/my50-bug31797-pushee
2008-01-11 19:00:26 +01:00
mhansson/martin@linux-st28.site
199a167246
Bug#31797: error while parsing subqueries -- WHERE is parsed as HAVING
...
The name resolution for correlated subqueries and HAVING clauses
failed to distinguish which of two was being performed when there
was a reference to an outer aliased field.
Fixed by adding the condition that HAVING clause name resulotion
is being performed.
2008-01-11 18:50:54 +01:00
gshchepa/uchum@host.loc
17c5117872
Merge host.loc:/home/uchum/work/5.1-opt-33699
...
into host.loc:/home/uchum/work/5.1-opt
2008-01-11 21:39:45 +04:00
mkindahl@dl145h.mysql.com
0e31b77207
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-11 18:13:00 +01:00
evgen@moonbone.local
baaf300d4c
Bug#29477: Not all fields of the target table were checked to have a default
...
value when inserting into a view.
The mysql_prepare_insert function checks all fields of the target table that
directly or indirectly (through a view) are specified in the INSERT
statement to have a default value. This check can be skipped if the INSERT
statement doesn't mention any insert fields. In case of a view this allows
fields that aren't mentioned in the view to bypass the check.
Now fields of the target table are always checked to have a default value
when insert goes into a view.
2008-01-11 20:10:54 +03:00
mkindahl@dl145h.mysql.com
940c3ef6d6
Fixing failing test case.
2008-01-11 18:09:17 +01:00
mkindahl@dl145h.mysql.com
da73cb9930
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-11 16:32:31 +01:00
mkindahl@dl145h.mysql.com
431199b7a3
Post-merge changes to make tests pass.
2008-01-11 16:26:03 +01:00
mkindahl@dl145h.mysql.com
940ecc23c6
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-11 14:20:06 +01:00
thek@adventure.(none)
77569d6708
Fixed faulty test case caused by race condition.
2008-01-11 14:16:46 +01:00
mkindahl@dl145h.mysql.com
d801920c56
Post-merge fixes to make tests pass.
2008-01-11 13:25:26 +01:00
mkindahl@dl145h.mysql.com
4324a5b6a3
Post-merge fixes to make binlog test suite pass.
2008-01-11 12:35:35 +01:00
gshchepa/uchum@host.loc
32d13ab23d
Bug#33699: The UPDATE statement allows NULL as new value on a NOT NULL
...
columns (default datatype value is assigned).
The mysql_update function has been modified to generate
an error when trying to set a NOT NULL field to NULL rather than a warning
in the set_field_to_null_with_conversions function.
2008-01-11 05:06:08 +04:00
kaa@kaamos.(none)
0ef58cfe6b
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-01-10 22:33:29 +03:00
kaa@kaamos.(none)
0cec5f8e4b
Merge kaamos.(none):/data/src/mysql-5.1
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-01-10 20:44:23 +03:00
kaa@kaamos.(none)
f8ade5e91b
Merge kaamos.(none):/data/src/mysql-5.0
...
into kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-01-10 20:43:05 +03:00