svoj@mysql.com/april.(none)
ad7da7f1de
Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
2006-09-29 00:00:27 +05:00
svoj@mysql.com/april.(none)
2de51adffa
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
2006-09-28 22:14:31 +05:00
svoj@mysql.com/april.(none)
b271d7653b
BUG#21617 - crash when selecting from merge table with inconsistent indexes
...
Crash may happen when selecting from a merge table that has underlying
tables with less indexes than in a merge table itself.
If number of keys in merge table is not bigger than requested key number,
return error.
2006-09-28 22:10:06 +05:00
svoj@mysql.com/april.(none)
19d9bdcecb
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21675/mysql-5.0-engines
2006-09-28 20:33:59 +05:00
svoj@mysql.com/april.(none)
3336ecf896
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21675/mysql-5.0-engines
2006-09-28 20:32:40 +05:00
svoj@mysql.com/april.(none)
efb75811bf
BUG#21675 - engine=archive 2GB file limit, when reached mysqld restarts on any query
...
If mysqld is linked against system installed zlib (which is likely compiled w/o
LFS) and archive table exceedes 2G, mysqld will likely be terminated with SIGXFSZ.
Prior to actual write perform a check if there is space in data file. This fixes
abnormal process termination with SIGXFSZ.
No test case for this bugfix.
2006-09-28 20:30:15 +05:00
istruewing@chilla.local
52758d8615
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug20719-m
2006-09-28 12:20:17 +02:00
istruewing@chilla.local
629076c5b3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug20719-m
2006-09-28 08:55:01 +02:00
svoj@mysql.com/april.(none)
b724a03e08
After merge fix.
2006-09-27 18:33:31 +05:00
svoj@mysql.com/april.(none)
bfb6ff6bdd
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-27 15:42:00 +05:00
svoj@mysql.com/april.(none)
a324cb8934
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-09-27 15:34:52 +05:00
svoj@mysql.com/april.(none)
c41bd4461b
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-27 15:25:00 +05:00
istruewing@chilla.local
fdc6500965
Merge chilla.local:/home/mydev/mysql-4.1-bug20719-m
...
into chilla.local:/home/mydev/mysql-5.0-bug20719-m
2006-09-27 12:03:49 +02:00
istruewing@chilla.local
ac778232cd
Bug#20719 - Reading dynamic records with write buffer could fail
...
After merge fix.
2006-09-27 11:55:30 +02:00
istruewing@chilla.local
6ff6d80e57
Merge chilla.local:/home/mydev/mysql-4.1-bug20719
...
into chilla.local:/home/mydev/mysql-4.1-bug20719-m
2006-09-27 09:30:54 +02:00
istruewing@chilla.local
f1db460851
Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty
...
into chilla.local:/home/mydev/mysql-5.0-bug14400-monty
2006-09-23 13:25:45 +02:00
istruewing@chilla.local
af6b36e818
Merge chilla.local:/home/mydev/mysql-4.0-bug14400
...
into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-23 11:24:47 +02:00
istruewing@chilla.local
2b121cd0e1
Bug#14400 - Query joins wrong rows from table which is subject of
...
"concurrent insert"
After merge fix.
2006-09-22 17:23:25 +02:00
istruewing@chilla.local
9d0cedffad
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into chilla.local:/home/mydev/mysql-4.0-bug14400
2006-09-22 15:06:01 +02:00
istruewing@chilla.local
bb2a7fec48
Merge chilla.local:/home/mydev/mysql-4.0--team
...
into chilla.local:/home/mydev/mysql-4.0-bug14400
2006-09-22 15:03:50 +02:00
istruewing@chilla.local
f083782c42
Merge chilla.local:/home/mydev/mysql-5.0--main
...
into chilla.local:/home/mydev/mysql-5.0-toteam
2006-09-21 10:55:23 +02:00
svoj@mysql.com/april.(none)
1306e65a0a
BUG#21459 - myisam_ftdump gives bad counts for common words
...
This problem affects myisam_ftdump tool only.
For fulltext index positive subkeys means word weight, negative subkeys
means number of documents in level 2 fulltext index.
Fixed that document counter was not properly updated for keys having
level 2 fulltext index.
No test case for this bug.
2006-09-20 17:12:37 +05:00
istruewing@chilla.local
1782889d35
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-20 08:33:46 +02:00
svoj@mysql.com/april.(none)
c0ebc0fb2a
BUG#10974 - No error message if merge table based on union of innodb, memory
...
Fixed confusing error message from the storage engine when
it fails to open underlying table. The error message is issued
when a table is _opened_ (not when it is created).
2006-09-20 01:40:59 +05:00
istruewing@chilla.local
7419f50245
After merge fix.
2006-09-19 14:26:18 +02:00
istruewing@chilla.local
5d509b32d4
Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty
...
into chilla.local:/home/mydev/mysql-5.0-bug14400-monty
2006-09-19 11:27:00 +02:00
istruewing@chilla.local
47dc3fbe8a
Merge bk-internal:/home/bk/mysql-4.0
...
into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-19 10:17:25 +02:00
istruewing@chilla.local
3307d448ee
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0--team
2006-09-19 09:26:42 +02:00
istruewing@chilla.local
418c1f30f8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0--team
2006-09-18 21:02:47 +02:00
svoj@may.pils.ru
43097593e3
Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-09-18 20:35:33 +05:00
gkodinov@dl145s.mysql.com
cf9d1c9152
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 19:01:07 +04:00
svoj@april.(none)
f53f015be6
Merge april.(none):/home/svoj/devel/bk/mysql-4.1-engines
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-18 16:25:18 +05:00
svoj@april.(none)
f21eadfc74
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-18 16:23:45 +05:00
gkodinov@dl145s.mysql.com
2ec485f06e
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:20:20 +02:00
gkodinov@dl145s.mysql.com
fae596aafd
merge fixes
2006-09-18 12:14:27 +02:00
gkodinov@dl145s.mysql.com
522823b5d3
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 11:19:40 +02:00
gkodinov@dl145s.mysql.com
fcf99e859f
Merge bk-internal:/home/bk/mysql-4.1-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-09-18 11:09:56 +02:00
igor@rurik.mysql.com
d3d3cef88c
Fixed bug #21493 : crash for the second execution of a function
...
containing a select statement that uses an aggregating IN subquery.
Added a parameter to the function fix_prepare_information
to restore correctly the having clause for the second execution.
Saved andor structure of the having conditions at the proper moment
before any calls of split_sum_func2 that could modify the having structure
adding new Item_ref objects. (These additions, are produced not with
the statement mem_root, but rather with the execution mem_root.)
2006-09-16 09:50:48 -07:00
msvensson@shellback.(none)
d8e27606e1
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 18:00:03 +02:00
gkodinov/kgeorge@macbook.gmz
c73d2318a3
Merge bk-internal:/home/bk/mysql-4.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B21180-4.1-opt
2006-09-15 18:56:05 +03:00
msvensson@shellback.(none)
6a0841a1bc
Add definition of SHUT_RDWR for compiling on windows
2006-09-15 17:53:45 +02:00
msvensson@shellback.(none)
b0fc6840b4
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 17:09:58 +02:00
msvensson@shellback.(none)
27d8545868
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 17:00:29 +02:00
msvensson@shellback.(none)
b178e40cae
Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602
...
into shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:57:37 +02:00
msvensson@shellback.(none)
bfc3cfd4ee
Merge msvensson.mysql.internal:mysql/my50-m-bug16574
...
into shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:55:47 +02:00
msvensson@shellback.(none)
557a8f50b8
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 16:52:52 +02:00
msvensson@shellback.(none)
fb89352b47
Merge msvensson.mysql.internal:mysql/my50-m-bug16576
...
into shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:52:08 +02:00
msvensson@shellback.(none)
223c82fde2
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 16:50:08 +02:00
msvensson@shellback.(none)
a297c29243
Merge msvensson.mysql.internal:mysql/my50-m-bug21222
...
into shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:49:24 +02:00
msvensson@shellback.(none)
2c3015499d
Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 16:42:27 +02:00