Commit graph

12917 commits

Author SHA1 Message Date
lars@dl145j.mysql.com
ed0e98529c Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-21 13:51:28 +02:00
lars@mysql.com
6839e64298 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-21 13:42:02 +02:00
knielsen@mysql.com
66bdb6de02 Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0
into  mysql.com:/data0/knielsen/mysql-5.0
2006-06-21 12:59:19 +02:00
knielsen@mysql.com
8167b2c8ef BUG#20578
Backport Valgrind suppression from mysql-5.1:

D 1.4 05/11/23 22:44:54+02:00 monty@mysql.com 5 4 12/0/154
P mysql-test/valgrind.supp
C Remove warning that may happens becasue threads dies in different order
2006-06-21 12:52:59 +02:00
monty@narttu.mysql.fi
20c00662eb Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-21 13:24:56 +03:00
gkodinov@mysql.com
bca6492927 Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean
into  mysql.com:/home/kgeorge/mysql/5.0/B18080
2006-06-21 13:06:32 +03:00
mskold@mysql.com
22334907fc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-21 12:03:08 +02:00
gkodinov@mysql.com
f327a8c536 merge of the changes for bug #18080 2006-06-21 13:03:06 +03:00
gkodinov@mysql.com
4f8f4cd51a manual merge 2006-06-21 13:01:00 +03:00
gkodinov@mysql.com
bee985af35 Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean
into  mysql.com:/home/kgeorge/mysql/5.0/B20482
2006-06-21 12:59:34 +03:00
gluh@eagle.intranet.mysql.r18.ru
8097ba2046 after merge fixes 2006-06-21 14:53:40 +05:00
gkodinov@mysql.com
75ca055493 Bug #20482: failure on Create join view with sources views/tables in different
schemas
The function check_one_table_access() called to check access to tables in 
SELECT/INSERT/UPDATE was doing additional checks/modifications that don't hold
in the context of setup_tables_and_check_access().
That's why the check_one_table() was split into two : the functionality needed by
setup_tables_and_check_access() into check_single_table_access() and the rest of 
the functionality stays in check_one_table_access() that is made to call the new
check_single_table_access() function.
2006-06-21 12:12:46 +03:00
mskold@linux.site
7704d973d4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-21 10:10:01 +02:00
bar@mysql.com
bfae7303d7 Bug#20086: Can't get data from key partitioned tables with VARCHAR key
The problem appeared because the same values produced different hash
during INSERT and SELECT for VARCHAR data type.
Fix:
VARCHAR required special treatment to avoid hashing of length bytes
(leftmost one or two bytes) as well as trailing bytes beyond real length,
which could contain garbage. Fix is done by introducing hash() - new method
in the Field class.
2006-06-21 13:00:19 +05:00
mskold@mysql.com
f0bd8a7cd9 Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed
into  mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-21 09:50:41 +02:00
anozdrin@mysql.com
5ce56c1cdc Disable IM tests. 2006-06-21 11:44:54 +04:00
mskold@mysql.com
bd3f9cc0a5 Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed
into  mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-21 09:42:15 +02:00
mskold@mysql.com
e77850e573 Fix for Bug #19906 REPLACE doesn't update TEXT fields correctly 2006-06-21 09:36:50 +02:00
igor@rurik.mysql.com
5e8d011c3a Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  rurik.mysql.com:/home/igor/mysql-4.1-opt
2006-06-20 22:15:30 -07:00
ramil@mysql.com
81277475f8 Merge mysql.com:/usr/home/ram/work/mysql-4.1
into  mysql.com:/usr/home/ram/work/mysql-5.0
2006-06-21 09:16:22 +05:00
igor@rurik.mysql.com
2893d11c5e Fixed bug #16674.
The length of the prefix of the pattern string in the LIKE predicate that 
determined the index range to be scanned was calculated incorrectly for
multi-byte character sets. 
As a result of this in 4. 1 the the scanned range was wider then necessary
if the prefix contained not only one-byte characters.  
In 5.0 additionally it caused missing some rows from the result set.
2006-06-20 19:57:21 -07:00
anozdrin@mysql.com
bb94cb24c5 Re-enable IM tests. 2006-06-21 02:17:39 +04:00
anozdrin@mysql.com
ddaebd13dc Fix merge 5.0 -> 5.1. 2006-06-21 02:16:38 +04:00
anozdrin@booka.site
3a6ad23f43 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/alik/MySQL/devel/5.1-merged
2006-06-21 02:00:49 +04:00
dlenev@mysql.com
b75254e101 Fix for bug#19634 "Re-execution of multi-delete which involve trigger/stored
function crashes server".

Attempts to execute prepared multi-delete statement which involved trigger or
stored function caused server crashes (the same happened for such statements
included in stored procedures in cases when one tried to execute them more
than once).

The problem was caused by yet another incorrect usage of check_table_access()
routine (the latter assumes that table list which it gets as argument
corresponds to value LEX::query_tables_own_last). We solve this problem by
juggling with LEX::query_tables_own_last value when we call
check_table_access() for LEX::auxilliary_table_list (better solution is too
intrusive and should be done in 5.1).
2006-06-21 01:50:20 +04:00
cmiller@zippy.(none)
deca07bdcc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
2006-06-20 17:17:04 -04:00
evgen@moonbone.local
8c0aa3560c field.cc, field.h:
Additional fix for #16377 for bigendian platforms
sql_select.cc, select.result, select.test:
  After merge fix
2006-06-21 01:14:53 +04:00
evgen@moonbone.local
278b26a39b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-21 01:10:59 +04:00
mikael@dator5.(none)
cd93441a0a Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug17138
2006-06-20 16:59:51 -04:00
evgen@moonbone.local
6b694bcd58 rpl_ndb_log.result:
Corrected test case result
2006-06-21 00:45:01 +04:00
mikael@dator5.(none)
da260e9e3f Merge dator5.(none):/home/pappa/bug16000
into  dator5.(none):/home/pappa/bug19281
2006-06-20 16:43:25 -04:00
mikael@dator5.(none)
a3d5c3bf6d BUG#16000: .par file left behind plus unnecessary messages to error.log
New test cases
2006-06-20 16:38:42 -04:00
evgen@moonbone.local
52d86dff85 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-06-20 23:49:33 +04:00
evgen@moonbone.local
bb53b6eeaa Manually merged 2006-06-20 23:22:51 +04:00
mikael@dator5.(none)
4f599159c7 Merge dator5.(none):/home/pappa/bug19309
into  dator5.(none):/home/pappa/bug19281
2006-06-20 15:18:16 -04:00
mikael@dator5.(none)
39b9c16e1a Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug19309
2006-06-20 15:13:44 -04:00
mikael@dator5.(none)
4dd8f90912 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug19281
2006-06-20 15:09:48 -04:00
evgen@moonbone.local
ae6970e6bc select.result:
Added test case for bug#18759 Incorrect string to numeric conversion.  
select.test:
  Added test case for bug#18759 Incorrect string to numeric conversion.
item_cmpfunc.cc:
  Cleanup after fix for bug#18360 removal
2006-06-20 23:05:55 +04:00
evgen@moonbone.local
1e0138fd3d Manually merged 2006-06-20 22:22:14 +04:00
elliot@mysql.com
37e5ec9f50 Applying patch from SergeyV
Fixes bug#17264, for alter table on win32 for successfull operation completion
it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
race condition when several clients do alter table simultaneously.
2006-06-20 13:43:13 -04:00
ngrishakin@mysql.com
4259e69798 ndb_dd_advance2 test 2006-06-20 19:18:34 +02:00
evgen@moonbone.local
66371d22e2 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-06-20 20:13:37 +04:00
evgen@moonbone.local
75164ffc2f rpl_ndb_log.result:
Fixed failing test case
2006-06-20 20:11:08 +04:00
rburnett@bk-internal.mysql.com
154961b26a Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-20 18:06:22 +02:00
anozdrin@mysql.com
42ef881906 Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged
into  mysql.com:/home/alik/MySQL/devel/5.1-merged
2006-06-20 18:28:28 +04:00
mikael@dator5.(none)
805ba2462e Fixed test case 2006-06-20 10:16:08 -04:00
mikael@dator5.(none)
e8d39758c7 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug19281
2006-06-20 10:08:30 -04:00
mikael@dator5.(none)
75f3586117 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug17138
2006-06-20 08:53:12 -04:00
rburnett@bk-internal.mysql.com
2d6fb900eb Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-20 14:51:32 +02:00
svoj@may.pils.ru
1c42c9730d Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
2006-06-20 16:45:51 +05:00