gluh@mysql.com/gluh.(none)
a039376c43
Patch for bug#21432 is reverted
2006-09-27 17:49:16 +05:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
878416e054
mysql_config.sh:
...
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
Filter out icc specific options from cflags/libs(_r)
2006-09-25 00:54:46 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
80dadacb03
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-23 07:11:32 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
7e45d80362
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-23 05:58:48 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
9538acf5dc
Adding proper setup phase for test case rpl_insert_id
2006-09-21 13:19:52 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
fe782f92d6
Vertical printout in test to make easier to read
2006-09-21 03:32:42 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
0c03f9348d
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-20 16:17:30 +02: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
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
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
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
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
istruewing@chilla.local
45f7514d03
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug14400
2006-09-15 14:02:43 +02:00
gkodinov@dl145s.mysql.com
325f820909
Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-4.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-09-15 11:43:28 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
ec51f809b8
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-15 01:15:39 +02:00
istruewing@chilla.local
d53ac19620
Bug#14400 - Query joins wrong rows from table which is subject of
...
"concurrent insert"
After merge fix.
2006-09-14 16:55:57 +02:00
evgen@moonbone.local
5841147d4d
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into moonbone.local:/work/21677-bug-4.1-opt-mysql
2006-09-14 18:46:44 +04:00
evgen@moonbone.local
a33d1d8484
type_date.test, type_date.result:
...
Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
2006-09-14 18:45:23 +04:00
evgen@moonbone.local
9fb0340a34
item_cmpfunc.cc:
...
Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
query_cache.result:
Corrected a test case after removing a fix for bug#16377
2006-09-12 19:06:26 +04:00
istruewing@chilla.local
38886ffa2b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug14400
2006-09-12 11:40:24 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
8c64ce171a
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-11 11:25:55 +02:00
gkodinov/kgeorge@macbook.gmz
719f836cc4
Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
...
VALUES() was considered a constant. This caused replacing
(or pre-calculating) it using uninitialized values before the actual
execution takes place.
Mark it as a non-constant (still not dependent of tables) to prevent
the pre-calculation.
2006-09-08 10:24:14 +03:00
evgen@moonbone.local
31c738d8a2
query_cache.result, func_time.test, type_date.result, func_time.result:
...
Corrected test case after removal of fix for bug#16377
type_date.test:
Corrected test case after removal of fix for bug#16377
item_cmpfunc.cc:
Removed changes to the agg_cmp_type() made in the for bug#16377
2006-09-08 00:59:34 +04:00
istruewing@chilla.local
45ceab9ec5
Merge chilla.local:/home/mydev/mysql-4.0-bug14400
...
into chilla.local:/home/mydev/mysql-4.1-bug14400
2006-09-07 16:46:20 +02:00
istruewing@chilla.local
39c0f0a484
Bug#14400 - Query joins wrong rows from table which is subject of
...
"concurrent insert"
Additional fix for full keys and test case.
2006-09-07 15:39:31 +02:00
gkodinov/kgeorge@rakia.(none)
580d4a0df4
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B16792-4.1-opt
2006-09-05 19:22:55 +03:00
jonas@perch.ndb.mysql.com
f8fdc3bcb0
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-09-05 15:05:52 +02:00
gkodinov/kgeorge@rakia.(none)
68b9ae4d14
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B21392-4.1-opt
2006-09-05 13:12:30 +03:00
gkodinov/kgeorge@macbook.gmz
3758b975f8
Bug #21392 : multi-table delete with alias table name fails with
...
1003: Incorrect table name
in multi-table DELETE the set of tables to delete from actually
references then tables in the other list, e.g:
DELETE alias_of_t1 FROM t1 alias_of_t1 WHERE ....
is a valid statement.
So we must turn off table name syntactical validity check for alias_of_t1
because it's not a table name (even if it looks like one).
In order to do that we add a special flag (TL_OPTION_ALIAS) to
disable the name checking for the aliases in multi-table DELETE.
2006-09-04 18:40:30 +03:00
timour/timka@lamia.home
cf3bed86b5
BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong result
...
Fix an error in the bug fix.
2006-09-04 16:53:03 +03:00
jonas@perch.ndb.mysql.com
7488c8fda8
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-09-04 14:45:13 +02:00
jonas@perch.ndb.mysql.com
96ff8b4c52
bug#21965 - replication
...
fix deadlock if master switches log file in parallell with "show master logs"
2006-09-04 13:43:34 +02:00
timour/timka@lamia.home
5a0d5670b8
Merge lamia.home:/home/timka/mysql/src/4.1-virgin
...
into lamia.home:/home/timka/mysql/src/4.1-bug-21787
2006-09-01 17:21:49 +03:00
timour/timka@lamia.home
02e194cea2
Fix for BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong result
...
The problem was due to a prior fix for BUG 9676, which limited
the rows stored in a temporary table to the LIMIT clause. This
optimization is not applicable to non-group queries with aggregate
functions. The fix disables the optimization in this case.
2006-09-01 15:07:04 +03:00
msvensson@neptunus.(none)
4b41566503
Backport from 5.0
...
- Dont test "encrypt" in ctype_ucs
2006-09-01 11:21:12 +02:00
jonas@perch.ndb.mysql.com
e650052803
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-09-01 10:32:12 +02:00
msvensson@shellback.(none)
2cb8215809
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-09-01 10:26:01 +02:00
msvensson@shellback.(none)
324cf4ccb3
Add target to make "mtr", shortcut for running test suite
2006-09-01 10:21:08 +02:00
jimw@rama.(none)
2b8f30a764
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into rama.(none):/home/jimw/my/mysql-4.1-21288
2006-08-31 21:23:25 -07:00
cmiller@zippy.cornsilk.net
9c94dade04
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-08-31 12:45:49 -04:00
cmiller@zippy.cornsilk.net
2d9187fcba
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my41-no-strange-literals
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-08-31 11:30:14 -04:00
cmiller@zippy.cornsilk.net
436d3a3798
Bitkeeper's Tk interface uses UTF8 by default, so mixing charsets in a
...
single file is a bad practice.
2006-08-31 11:14:04 -04:00
aelkin/elkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi
45568bbe11
BUG#18822 LOAD DATA FROM MASTER corrupts data
...
there is a bunch of dups. It has been decided to declare this feature as
deprecated.
2006-08-31 02:00:40 +03:00
tsmith@maint2.mysql.com
9a8ed3fe3e
Merge maint2.mysql.com:/data/localhome/tsmith/bk/g41
...
into maint2.mysql.com:/data/localhome/tsmith/bk/41
2006-08-31 00:23:15 +02:00
tsmith@maint2.mysql.com
4ae5e61620
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
...
into maint2.mysql.com:/data/localhome/tsmith/bk/41
2006-08-30 23:49:21 +02:00
cmiller@zippy.cornsilk.net
5a3922fbf1
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my40-bug04053
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
2006-08-30 17:33:28 -04:00
cmiller@zippy.cornsilk.net
2c356ec7db
Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \
...
event' from master"
Since there is no repeatable test case, and this is obviously wrong, this is
the most conservative change that might possibly work.
The syscall read() wasn't checked for a negative return value for an
interrupted read. The kernel sys_read() returns -EINTR, and the "library"
layer maps that to return value of -1 and sets errno to EINTR. It's
impossible (on Linux) for read() to set errno EINTR without the return
value being -1 .
So, if we're checking for EINTR behavior, we should not require that the
return value be zero.
2006-08-30 17:28:34 -04:00
tsmith@maint2.mysql.com
e80741b3a5
Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows
2006-08-30 22:39:23 +02:00
tsmith@maint2.mysql.com
843135ae1f
portability fix in BUILD/* for solaris
2006-08-30 21:24:09 +02:00
tsmith@maint2.mysql.com
0da8a4e321
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40
...
into maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
2006-08-30 20:04:33 +02:00