tsmith@maint1.mysql.com
438b94e204
.del-sp.test.orig:
...
Delete: mysql-test/t/sp.test.orig
2006-08-02 02:21:36 +02:00
evgen@sunlight.local
d6cf536d93
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-08-02 02:19:46 +04:00
evgen@sunlight.local
7b361c83b7
sql_view.cc:
...
After merge fix
2006-08-02 00:38:38 +04: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
evgen@sunlight.local
d4f92cbb5c
Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-08-01 20:52:21 +04: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
evgen@sunlight.local
56a66c8dc4
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-08-01 20:01:05 +04:00
evgen@sunlight.local
0cb98e4f4a
Makefile.am:
...
After merge fix
2006-08-01 19:56:22 +04:00
evgen@sunlight.local
a8405f650d
func_str.result:
...
After merge fix
2006-08-01 18:55:44 +04: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
serg@janus.mylan
12dc638abd
compile-time definition of intptr type
2006-08-01 14:02:19 +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@macbook.gmz
6909ab2627
serg's MacOSX-intel portability diff
2006-08-01 11:34:11 +03: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
msvensson@neptunus.(none)
4131be777e
Bug#20439 mysqltest: remove unused options
...
-Remove leftovers of server_stop and server_start commands
2006-08-01 09:36:27 +02:00
msvensson@neptunus.(none)
39130d15eb
Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug19535
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-01 09:33:00 +02:00
evgen@sunlight.local
dda7a95c59
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-08-01 09:24:19 +04:00
evgen@sunlight.local
799ecc9f2a
After merge fix
2006-08-01 08:49:43 +04: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@dl145k.mysql.com
317bc36fd9
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-08-01 02:13:45 +02: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
evgen@sunlight.local
1007b441df
Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-07-31 23:49:52 +04:00
lars/lthalmann@dl145j.mysql.com
418d4eb39d
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-07-31 21:36:10 +02: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
sergefp@mysql.com
6056f7714e
BUG#14940: Post-merge fixes: update test results
2006-07-31 22:22:01 +04: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
gkodinov/kgeorge@macbook.gmz
8d4684b6b4
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B21080-5.0-opt
2006-07-31 17:40:09 +03:00
gkodinov/kgeorge@macbook.gmz
8944564fd8
Bug #21080 : ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
...
When executing ALTER TABLE all the attributes of the view were overwritten.
This is contrary to the user's expectations.
So some of the view attributes are preserved now : namely security and
algorithm. This means that if they are not specified in ALTER VIEW
their values are preserved from CREATE VIEW instead of being defaulted.
2006-07-31 17:33:37 +03:00
msvensson@neptunus.(none)
f1a262bcd5
Merge bk-internal:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-07-31 16:07:28 +02:00
msvensson@neptunus.(none)
bc0c886ded
Merge 192.168.0.20:mysql/bug21217/my51-bug21217
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-07-31 14:43:49 +02:00
msvensson@neptunus.(none)
5f78c492ec
Merge 192.168.0.20:mysql/bug21217/my50-bug21217
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-31 14:42:06 +02:00