evgen@sunlight.local
a73d90e705
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sunlight.local:/local_work/leak_fix
2006-08-07 02:29:59 +04:00
evgen@sunlight.local
f72600ca39
Merge sunlight.local:/home/evgen/bk-trees/mysql-5.0
...
into sunlight.local:/local_work/leak_fix
2006-08-07 00:06:54 +04:00
evgen@sunlight.local
854245e715
sql_view.cc:
...
Memory leak fix
2006-08-07 00:06:03 +04:00
kostja@bodhi.local
2f9a6c7c4b
Add my_memmem.c to mysys.dsp (needed by mysql_client_test)
2006-08-04 01:41:21 +04:00
kostja@bodhi.local
12051070a7
Fix a bug in the .dsp file. Ignore a symlink.
2006-08-04 00:00:48 +04:00
msvensson@neptunus.(none)
b9b2ef9cfb
Make test case for bug#21215repeateble by calling "reset master"
2006-08-03 16:47:24 +02:00
msvensson@neptunus.(none)
ac4e03a315
Update result after merge, since the function Item::tmp_table_field_from_field_type()
...
now takes mbmaxlen into account when calculating max_length of new field.
2006-08-03 15:48:28 +02:00
svoj@may.pils.ru
34c83fba8d
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
2006-08-03 15:49:41 +05:00
msvensson@neptunus.(none)
5fc215e2e3
Bug#21419 test case lowercase_fs_off fails on Windows
...
- Backport patch from 5.0
2006-08-03 12:16:24 +02:00
msvensson@neptunus.(none)
10a7b8cedf
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-03 12:11:07 +02:00
msvensson@neptunus.(none)
61c5d97309
Remove double error printout in mysqldump
2006-08-03 12:09:22 +02:00
msvensson@neptunus.(none)
c71ac0efa6
Merge neptunus.(none):/home/msvensson/mysql/my41-bug21218
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-03 11:59:57 +02:00
msvensson@neptunus.(none)
83167f06a3
Merge neptunus.(none):/home/msvensson/mysql/my41-bug21218
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-08-03 11:57:52 +02:00
msvensson@neptunus.(none)
743948404a
Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21215
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-08-03 11:48:08 +02:00
svoj@may.pils.ru
395d3c3985
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
2006-08-03 14:08:43 +05:00
svoj@may.pils.ru
67db270c71
BUG#7391 - Cross-database multi-table UPDATE uses active database
...
privileges
This problem is 4.1 specific. It doesn't affect 4.0 and was fixed
in 5.x before.
Having any mysql user who is allowed to issue multi table update
statement and any column/table grants, allows this user to update
any table on a server (mysql grant tables are not exception).
check_grant() accepts number of tables (in table list) to be checked
in 5-th param. While checking grants for multi table update, number
of tables must be 1. It must never be 0 (actually we have
DBUG_ASSERT(number > 0) in 5.x in grant_check() function).
2006-08-03 14:03:08 +05:00
msvensson@neptunus.(none)
1572beadcd
Removing disabling of lowercase_fs_off
2006-08-03 09:48:42 +02:00
msvensson@neptunus.(none)
7280f63100
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-03 09:32:58 +02:00
jimw@rama.(none)
9d67aacead
Merge rama.(none):/home/jimw/my/mysql-5.0-19147
...
into rama.(none):/home/jimw/my/mysql-5.0-16502
2006-08-02 19:52:11 -07:00
jimw@rama.(none)
41956bee4f
Merge rama.(none):/home/jimw/my/mysql-5.0-16881
...
into rama.(none):/home/jimw/my/mysql-5.0-16502
2006-08-02 19:51:34 -07:00
jimw@rama.(none)
95b3b2ea8d
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into rama.(none):/home/jimw/my/mysql-5.0-16502
2006-08-02 19:48:12 -07:00
cmiller@zippy.cornsilk.net
dd5eeaf676
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/m41-maint--07OBQ
2006-08-02 14:57:12 -04:00
kostja@bodhi.local
35af3d5578
Disable a failing test case (filed a p1 bug)
2006-08-02 22:21:12 +04:00
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
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
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
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