mskold/marty@mysql.com/linux.site
66e8255491
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-08-15 13:37:39 +02:00
mskold/marty@mysql.com/linux.site
6a3143e2a0
ndb_lock.test, ndb_lock.result:
...
bug #18184 SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
2006-08-15 13:12:27 +02:00
kostja@bodhi.local
d03b39aaab
Fix a test case (proper clean up).
2006-08-14 19:18:33 +04:00
svoj@may.pils.ru
91e94d781f
Merge may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0
2006-08-14 18:08:33 +05:00
svoj@may.pils.ru
d4bdba176f
BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1
...
Fixed by moving update_key_parts() down to be after write_index().
2006-08-14 17:05:02 +05:00
svoj@may.pils.ru
07a1ed651f
Extended a test case for bug#7391.
2006-08-11 14:41:07 +05:00
svoj@may.pils.ru
827164916c
Merge may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-5.0
2006-08-11 14:24:09 +05:00
cmiller@zippy.cornsilk.net
f6f7eb851e
Merge updates.
2006-08-10 12:39:18 -04:00
cmiller@zippy.cornsilk.net
364dfae629
Removed Iggy's accidentally-added files.
2006-08-10 01:02:31 -04:00
cmiller@zippy.cornsilk.net
543fcde9b9
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
2006-08-09 22:23:41 -04:00
svoj@may.pils.ru
5f3d231f57
Merge may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-5.0
2006-08-09 14:33:45 +05:00
svoj@may.pils.ru
81b70f9798
BUG#20060 - mysqld option "--flush " doesn't work for update statement
...
Problem described in this bug report affects MyISAM tables only.
Running mysqld --flush instructs mysqld to sync all changes to disk
after each SQL statement. It worked well for INSERT and DELETE
statements, but it did sync for UPDATE only in case if there was
index change (change of colum that has an index). If no updated column
has an index, data wasn't synced to disk.
This fix makes UPDATE statement to sync data to disk even if there is
no index change (that is only data change) and mysqld is run with
--flush option.
2006-08-09 14:28:39 +05:00
evgen@sunlight.local
6691c62310
sql_view.cc:
...
After merge fix
2006-08-09 06:46:06 +04:00
evgen@sunlight.local
95713e9896
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sunlight.local:/local_work/leak_fix
2006-08-09 01:45:42 +04:00
evgen@sunlight.local
b5a5cb4ad7
Merge sunlight.local:/home/evgen/bk-trees/mysql-5.0
...
into sunlight.local:/local_work/leak_fix
2006-08-09 01:43:11 +04:00
evgen@sunlight.local
1250b06ac9
sql_base.cc, unireg.h, sql_lex.h, table.cc, sql_view.h, sql_view.cc:
...
Correct memory leak fix
2006-08-09 00:05:42 +04:00
evgen@sunlight.local
00399c0076
sql_view.cc:
...
Memory leak fix
2006-08-07 07:41:49 +04:00
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