kostja@bodhi.local
1b145118b9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-08-02 21:54:10 +04:00
cmiller@zippy.cornsilk.net
c9f64f71c8
Bug#9719: DELETE with WHERE on HEAP table just deletes first row of matched
...
set.
(Ramil's patch, recreated.)
2006-08-02 13:06:59 -04:00
kostja@bodhi.local
3d3bf24a93
A post-merge fix.
2006-08-02 19:39:47 +04:00
iggy@rolltop.ignatz42.dyndns.org
757493d4ec
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_bug20721
2006-08-02 11:13:55 -04:00
evgen@moonbone.local
7451ffcd0a
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-02 18:16:05 +04:00
evgen@moonbone.local
83896aa8f6
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-08-02 18:11:59 +04:00
evgen@moonbone.local
90f23a251a
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-08-02 16:48:17 +04:00
evgen@moonbone.local
7f0a080660
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-08-02 16:46:55 +04:00
evgen@moonbone.local
67c85a170a
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-08-02 16:44:56 +04:00
evgen@moonbone.local
cac5ad03b9
Merge moonbone.local:/work/tmp_merge-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-02 16:40:32 +04:00
svoj@may.pils.ru
6c6f435b03
BUG#14770 - LOAD DATA INFILE doesn't respect default values for
...
columns
Fixed confusing warning.
Quoting INSERT section of the manual:
----
Inserting NULL into a column that has been declared NOT NULL. For
multiple-row INSERT statements or INSERT INTO ... SELECT statements, the
column is set to the implicit default value for the column data type. This
is 0 for numeric types, the empty string ('') for string types, and the
"zero" value for date and time types. INSERT INTO ... SELECT statements are
handled the same way as multiple-row inserts because the server does not
examine the result set from the SELECT to see whether it returns a single
row. (For a single-row INSERT, no warning occurs when NULL is inserted into
a NOT NULL column. Instead, the statement fails with an error.)
----
This is also true for LOAD DATA INFILE. For INSERT user can specify
DEFAULT keyword as a value to set column default. There is no similiar
feature available for LOAD DATA INFILE.
2006-08-02 17:15:50 +05:00
evgen@moonbone.local
40a1fbdffb
Merge moonbone.local:/work/tmp_merge-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-02 16:10:52 +04:00
holyfoot/hf@mysql.com/deer.(none)
2119067eee
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mysql-4.1.20317
2006-08-02 16:57:46 +05:00
kostja@bodhi.local
4bfc67fc3c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-08-02 14:13:01 +04:00
georg@lmy002.wdf.sap.corp
6cbc44c45c
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2006-08-02 11:39:59 +02:00
kostja@bodhi.local
607838488c
Fix a compilation failiure on QNX
2006-08-02 13:25:13 +04:00
holyfoot/hf@mysql.com/vva.(none)
224faba0bb
Merge hf@192.168.21.12:work/mysql-5.0.19452
...
into mysql.com:/home/hf/work/mysql-5.0.ps
2006-08-02 14:17:17 +05:00
holyfoot/hf@mysql.com/deer.(none)
6ebfbf561a
Merge bk@192.168.21.1:mysql-5.0-kt
...
into mysql.com:/home/hf/work/mysql-5.0.19452
2006-08-02 14:17:16 +05:00
holyfoot/hf@mysql.com/deer.(none)
f069fcdb11
Merge bk@192.168.21.1:mysql-5.0-kt
...
into mysql.com:/home/hf/work/mysql-5.0.14807
2006-08-02 14:03:20 +05:00
georg@lmy002.wdf.sap.corp
5f5c7bade3
Bug #21396 : Wrong error number generated for a missing table
2006-08-02 10:00:28 +02:00
msvensson@neptunus.(none)
502498ed7b
Disable test case for for bug 21042
2006-08-02 08:46:58 +02:00
tsmith@maint1.mysql.com
438b94e204
.del-sp.test.orig:
...
Delete: mysql-test/t/sp.test.orig
2006-08-02 02:21:36 +02:00
tsmith@maint1.mysql.com
951eb48a62
Applied innodb-5.0-ss677 snapshot.
...
Fixes:
- bug #19834 : Using cursors when running in READ-COMMITTED can cause InnoDB to crash
- bug #21112 : InnoDB slow with > 100,000 .ibd files
- bug #21113 : Duplicate printout in SHOW INNODB STATUS
2006-08-01 21:59:58 +02:00
msvensson@neptunus.(none)
396a51b4bc
Merge 192.168.0.20:mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-01 20:39:48 +02:00
msvensson@neptunus.(none)
31be565d2e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-01 20:24:30 +02:00
msvensson@shellback.(none)
116feb009e
Import latest version of yaSSL
2006-08-01 20:20:46 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
a1936d28a6
Bug#15669
...
"Test case 'csv' produces incorrect result on OpenBSD"
mmapped pages were not being invalidated when writes occurred to the
file vi a fd i/o operation.
Force explicit invalidation and not rely on implicit invalidation.
2006-08-01 09:36:34 -07:00
msvensson@neptunus.(none)
587b9caabb
Merge bk-internal:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-08-01 15:36:37 +02:00
msvensson@neptunus.(none)
09a36146b8
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-01 15:22:54 +02:00
msvensson@neptunus.(none)
c1f0f4dc58
Add missing $
2006-08-01 15:21:09 +02:00
igreenhoe@maint1.mysql.com
ff3a640e8f
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into maint1.mysql.com:/data/localhome/igreenhoe/mysql-5.0-maint
2006-08-01 13:04:48 +02:00
msvensson@neptunus.(none)
111513f09f
Bug#21367 IM tests do not recognize "win2003-amd64" as Windows
...
- Disable Instance manager on Windows
2006-08-01 11:35:37 +02:00
msvensson@neptunus.(none)
e9b624df99
Change error code to test for "unknown error" with to 10000
2006-08-01 11:29:10 +02:00
gkodinov/kgeorge@rakia.(none)
8cf5a4c04e
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B20103-5.0-opt
2006-08-01 11:17:14 +03:00
gkodinov/kgeorge@macbook.gmz
7b5e4ed026
Bug #20103 : Escaping with backslash does not work
...
- make the client to respect the server-side
no_backslash_escapes option and disable the
special meaning of backslash also at client side.
2006-08-01 11:05:54 +03:00
lars/lthalmann@mysql.com/dl145j.mysql.com
d8d17559ee
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-08-01 06:09:41 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
d9f5416be5
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-08-01 06:08:09 +02:00
gkodinov/kgeorge@rakia.(none)
63d198af1c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
2006-08-01 06:11:11 +03:00
evgen@sunlight.local
6806776eed
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
2006-08-01 06:42:33 +04:00
lars/lthalmann@mysql.com/dl145j.mysql.com
b3bc1d02de
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-08-01 02:10:30 +02:00
rburnett@bk-internal.mysql.com
a35d3241f4
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-07-31 23:17:18 +02:00
igreenhoe/greenman@anubis.greendragongames.com
d97a344e7a
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-5.0-maint
2006-07-31 13:04:01 -07:00
igreenhoe/greenman@anubis.greendragongames.com
940db2e976
Merge anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-4.1-maint
...
into anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-19364
2006-07-31 12:53:47 -07:00
lars/lthalmann@mysql.com/dl145j.mysql.com
3fc037db1b
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-07-31 21:32:57 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
635281619b
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-07-31 21:30:24 +02:00
malff/marcsql@weblab.(none)
2336834e08
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-21269
2006-07-31 12:11:08 -07:00
evgen@moonbone.local
b43b2a2fe0
select.result, func_group.result, sql_select.cc:
...
After merge fix
2006-07-31 23:05:54 +04:00
malff/marcsql@weblab.(none)
ab86e0b3cb
Bug#21269 (DEFINER-clause is allowed for UDF-functions)
...
The problem was that the grammar allows to create a function with an optional
definer clause, and define it as a UDF with the SONAME keyword.
Such combination should be reported as an error.
The solution is to not change the grammar itself, and to introduce a
specific check in the yacc actions in 'create_function_tail' for UDF,
that now reports ER_WRONG_USAGE when using both DEFINER and SONAME.
2006-07-31 12:01:43 -07:00
gkodinov/kgeorge@rakia.(none)
a5e56e8942
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
2006-07-31 21:17:20 +03:00
gkodinov/kgeorge@macbook.gmz
8084a9e5fb
Bug #11551 : Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
...
made DROP VIEW to continue on error and report an aggregated error
at its end. This makes it similar to DROP TABLE.
2006-07-31 20:56:06 +03:00