Commit graph

32736 commits

Author SHA1 Message Date
evgen@sunlight.local
b9949ed9c7 Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
Mutli-table uses temporary table to store new values for fields. With the
new values the rowid of the record to be updated is stored in a Field_string
field. Table to be updated is set as source table of the rowid field.
But when the temporary table creates the tmp field for the rowid field it
converts it to a varstring field because the table to be updated was created by
the v4.1. Due to this the stored rowids were broken and no records for 
update were found.

The flag can_alter_field_type is added to Field_string class. When it is set to
0 the field won't be converted to varstring. The Field_string::type() function 
now always returns MYSQL_TYPE_STRING if can_alter_field_type is set to 0.
The multi_update::initialize_tables() function now sets can_alter_field_type
flag to 0 for the rowid fields denying conversion of the field to a varstring
field.
2006-04-05 13:29:04 +04:00
jonas@perch.ndb.mysql.com
0e410aa1b3 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-04-05 11:21:36 +02:00
kent@mysql.com
1f88c4e5df Merge mysql.com:/Users/kent/mysql/bk/tmp_merge
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-04-05 10:39:44 +02:00
msvensson@shellback.(none)
b0c6455908 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-04-05 10:08:38 +02:00
mats@mysql.com
7b250a3fc0 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b18436-mysql-5.1-new
2006-04-05 09:10:31 +02:00
kent@mysql.com
b492d05ee9 Merge 2006-04-04 23:37:44 +02:00
igor@rurik.mysql.com
f485125968 Fixed bug #18237.
The code in opt_sum_query that prevented the COUNT/MIN/MAX 
optimization from being applied to outer joins  was not adjusted 
after introducing nested joins. As a result if an outer join
contained a reference to a view as an inner table the code of
opt_sum_query missed the presence of an on expressions and
erroneously applied the mentioned optimization.
2006-04-04 12:55:02 -07:00
joerg@mysql.com
d99d4d9bb1 Merge 2006-04-04 20:25:23 +02:00
mats@mysql.com
0729afd839 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b18436-mysql-5.1-new
2006-04-04 19:44:03 +02:00
timour@mysql.com
51476082b7 Merge mysql.com:/home/timka/mysql/src/5.0-tmp-merge
into  mysql.com:/home/timka/mysql/src/5.1-merge
2006-04-04 14:35:17 +03:00
igor@rurik.mysql.com
679dbc7627 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-04 04:35:16 -07:00
tomas@poseidon.ndb.mysql.com
8237832aac Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-04 13:35:15 +02:00
sergefp@mysql.com
b83da14c6a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-bug18659-pre
2006-04-04 15:35:14 +04:00
bar@mysql.com
562386b9a9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2006-04-04 15:42:32 +05:00
bar@mysql.com
1c74e21809 After merge fix for Bug#12076 --with-extra-charsets has no effect 2006-04-04 15:40:42 +05:00
igor@rurik.mysql.com
274afed734 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into  rurik.mysql.com:/home/igor/mysql-5.0
2006-04-04 02:50:55 -07:00
tomas@poseidon.ndb.mysql.com
93f1422aca Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-04-04 11:50:54 +02:00
tomas@poseidon.ndb.mysql.com
7cd8c8428a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-04 11:48:28 +02:00
tomas@poseidon.ndb.mysql.com
63f5820217 Bug #18349 Wrong error message "Array index out of bounds... 2006-04-04 11:34:31 +02:00
tomas@poseidon.ndb.mysql.com
6ff2ba05db Bug #18490 cluster: binlog events lost on remote mysqld (asynchronous) 2006-04-04 11:25:02 +02:00
tomas@poseidon.ndb.mysql.com
2c7d48c846 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-04 10:23:05 +02:00
msvensson@shellback.(none)
abc72552b5 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/bug17368/my51-bug17368
2006-04-04 10:00:27 +02:00
msvensson@shellback.(none)
67bcb953aa Bug#17368 General log and slow query log don't work
- Port ha_tina.cc to run on windows
2006-04-04 09:59:19 +02:00
msvensson@shellback.(none)
d387211106 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-04-04 09:51:06 +02:00
msvensson@shellback.(none)
d4c7943891 Add option --debugger=NAME and --client-debugger=NAME.
Add support for "--debugger=windbg" and "--debugger=vcexpress"
2006-04-04 09:49:32 +02:00
igor@rurik.mysql.com
0b60e05646 Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-03 23:26:31 -07:00
igor@rurik.mysql.com
c4e61aa478 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-03 21:10:23 -07:00
igor@rurik.mysql.com
26b2c5d7bd Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into  rurik.mysql.com:/home/igor/mysql-5.0
2006-04-03 21:07:27 -07:00
igor@rurik.mysql.com
41a1d252d9 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-03 21:04:38 -07:00
igor@rurik.mysql.com
788463869a Post review changes for the fix of bug #16504. 2006-04-03 21:02:40 -07:00
sergefp@mysql.com
2130fd06bd BUG#18659: In get_part_iter_for_interval_via_walking(), when we need to
obtain partition number, call partition_info->get_part_partition_id() when
the table has subpartitions, and get_partition_id() otherwise. (The bug
was that we were always doing the latter)
2006-04-04 00:52:14 +04:00
acurtis@xiphis.org
7accd6844b include example storage engines in max build 2006-04-03 11:51:57 -07:00
jonas@perch.ndb.mysql.com
2abc5e2f77 ndb -
fix testprogam if only 1 node group
2006-04-03 20:43:14 +02:00
tomas@poseidon.ndb.mysql.com
d0ca8374cd Bug #18596 binlog schema event auto push causes mysqld errors
- move slock bitmask to separate hash list, object living only during query
2006-04-03 19:11:20 +02:00
bpontz@shasta.mysql.com
3ad9bc880d .libs is no longer used when compiling netware 2006-04-03 11:54:09 -04:00
mats@mysql.com
9150b2169b Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b18436-mysql-5.1-new
2006-04-03 15:31:12 +02:00
bar@mysql.com
26100744eb Merge mysql.com:/usr/home/bar/mysql-4.1.12076
into  mysql.com:/usr/home/bar/mysql-5.0
2006-04-03 17:24:14 +05:00
bar@mysql.com
2c2ee32b93 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.12076
2006-04-03 17:11:54 +05:00
jonas@perch.ndb.mysql.com
274e35c4d6 ndb -
Fix compile error...when compiling debug
2006-04-03 13:12:23 +02:00
jonas@perch.ndb.mysql.com
7109c84c16 ndb - bug#18612 - partitioned startup
add testprg for SR case aswell
2006-04-03 12:09:50 +02:00
serg@serg.mylan
a1bf113868 yassl link problem fixed 2006-04-03 12:07:18 +02:00
jonas@perch.ndb.mysql.com
1aa9a95065 ndb - bug#18612
post weeked fixes :-)
  change impl. to use READ_NODESREQ to query state of other qmgr(partition)
    this as it has no (current) side effects, so that it's possible only to kill
    starting cluster (if one started and one starting)
2006-04-03 11:26:29 +02:00
knielsen@mysql.com
ccbd4b80be Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
2006-04-03 10:32:19 +02:00
knielsen@mysql.com
8a78628f0a Missing file in last commit. 2006-04-03 10:28:53 +02:00
knielsen@mysql.com
8e7907c36e Add embedded server build to the CMake build files. 2006-04-03 10:25:36 +02:00
kent@mysql.com
0298bfaac6 Merge 2006-04-03 03:52:22 +02:00
kent@mysql.com
6783064d02 Makefile.am:
Distribute mysql-test-run.pl
2006-04-03 03:47:28 +02:00
kent@mysql.com
6ba1a85726 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-03 03:40:54 +02:00
kent@mysql.com
e1d6c31984 mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c:
Changed web address order.mysql.com to shop.mysql.com
2006-04-03 03:37:43 +02:00
kent@mysql.com
52db1e450a Makefile.am:
Install Perl mysql-test-run into test directory
2006-04-02 02:10:41 +02:00