reggie@big_geek.
55165b2f55
small fix to enable the test suite to find executables and scripts on Windows
2006-08-16 10:19:48 -05:00
ramil/rkalimullin@production.mysql.com
4ef5116425
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
2006-08-16 06:37:39 +02:00
mskold/marty@mysql.com/linux.site
36042d81e4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-08-15 22:18:41 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
711b592701
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into xiphis.org:/opt2/tmp/autopush/mysql-5.0-fixbuild
2006-08-15 10:31:39 -07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b65bf3b4da
Merge mysql.com:/usr/home/ram/work/tmp_merge
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-08-15 19:41:23 +05:00
mskold/marty@mysql.com/linux.site
3b42e84c44
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-08-15 15:57:36 +02:00
mskold/marty@mysql.com/linux.site
c8b93da355
Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range
2006-08-15 14:31:21 +02:00
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
acurtis/antony@xiphis.org/ltantony.xiphis.org
4c57a94b78
fix windows build
2006-08-15 01:54:14 -07:00
bar@mysql.com/bar.intranet.mysql.r18.ru
9f6c76eb20
Merge mysql.com:/usr/home/bar/mysql-4.1.b19741
...
into mysql.com:/usr/home/bar/mysql-5.0.b19741merge
2006-08-15 12:04:51 +05:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
e2d4aa2ca4
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/mysql-5.0-merge
2006-08-14 21:27:36 -07:00
brian@zim.(none)
c43a332859
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/dep-5.0
2006-08-14 09:45:41 -07: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
brian@zim.(none)
7429c871b9
Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing.
2006-08-14 03:29:17 -07: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
ramil/ram@mysql.com/myoffice.izhnet.ru
50ae5b7989
Fix for bug #20709 : Collation not used in group by on 4.1.
...
myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing
TEXT and VARTTEXT key segments.
2006-08-10 15:06:22 +05: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
pgalbraith/patg@govinda.patg.net
6b96294223
autopush test - sorry for the commit messages, ignore
2006-08-09 17:41:35 -07:00
cmiller@zippy.cornsilk.net
8e4460343f
Removed iggy's accidentally checked-in test files.
2006-08-09 13:41:08 -04:00
svoj@may.pils.ru
6d23dd824c
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1
2006-08-09 14:35:45 +05: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
svoj@may.pils.ru
b5cd11cf0e
After merge fix.
2006-08-07 19:35:02 +05:00
svoj@may.pils.ru
d1cb2c6182
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into may.pils.ru:/home/svoj/devel/mysql/BUG14770/mysql-5.0-engines
2006-08-07 18:00:46 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
7ff64de172
Merge mysql.com:/usr/home/bar/mysql-4.1.b19741v0
...
into mysql.com:/usr/home/bar/mysql-4.1.b19741
2006-08-07 13:15:23 +05: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