istruewing@chilla.local
3a6b8d38d4
Bug#28158 - table->read_set is set incorrectly,
...
causing wrong error message in Falcon
An error message about a duplicate key could show a wrong key
value when not all columns of the key were used to select the
rows for update.
Some storage engines return a record with only the selected
columns filled.
This is fixed by re-reading the record with a read_set which
includes all columns of the duplicate key after a duplicate key
error happens and before the error message is printed.
2007-07-12 20:21:17 +02:00
thek@adventure.(none)
825b5096ad
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-07-12 15:38:23 +02:00
thek@adventure.(none)
2a5e7fe592
Merge adventure.(none):/home/thek/Development/cpp/bug28249/my50-bug28249
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-07-12 15:30:34 +02:00
thek@adventure.(none)
8ee7e48de8
Bug#28249 Query Cache returns wrong result with concurrent insert / certain lock
...
A race condition in the integration between MyISAM and the query cache code
caused the query cache to fail to invalidate itself on concurrently inserted
data.
This patch fix this problem by using the existing handler interface which, upon
each statement cache attempt, compare the size of the table as viewed from the
cache writing thread and with any snap shot of the global table state. If the
two sizes are different the global table size is unknown and the current
statement can't be cached.
2007-07-12 13:29:51 +02:00
anozdrin/alik@ibm.
3f2e94c401
Fix for 5.1 for BUG#10491: Server returns data as charset binary
...
SHOW CREATE TABLE or SELECT FROM I_S.
This is the last patch for this bug, which depends on the big
CS patch and was pending.
The problem was that SHOW CREATE statements returned original
queries in the binary character set. That could cause the query
to be unreadable.
The fix is to use original character_set_client when sending
the original query to the client. In order to preserve the query
in mysqldump, 'binary' character set results should be set when
issuing SHOW CREATE statement. If either source or destination
character set is 'binary' , no conversion is performed.
The idea is that since the source character set is no longer
'binary', we fix the destination character set to still produce
valid dumps.
2007-07-12 12:49:39 +04:00
kostja@bodhi.(none)
3364066e29
A fix and a test case for Bug#25859 ALTER DATABASE works w/o parameters.
...
Fix the parser to make the database options not optional.
2007-07-12 01:10:29 +04:00
serg@janus.mylan
859304f708
fix for smarter index mergein fulltext
...
to work for queries like "+a (b)"
2007-07-11 15:26:19 +02:00
svoj@june.mysql.com
05a12b7bb7
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG29445/mysql-5.1-engines
2007-07-11 15:58:08 +05:00
svoj@mysql.com/june.mysql.com
31c8efc812
BUG#29445 - match ... against () never returns
...
Part 1:
Do not perform index search for a plus-word with truncation operator
in case there are other plus-words in expression.
Specifically this optimization was enforced for expression like
"+word1 +word2*", but wasn't enforced for expression like
"+word1 word2*".
2007-07-10 15:37:39 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
372856cd72
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/mysql-5.1-maint
2007-07-10 14:22:37 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
5fb5f2a9a5
Fix for bug #29652 : csv.test failure: two changes conflict after merge
...
Problem: we don't take into account the length of the data written
to the temporary data file during update on a CSV table.
Fix: properly calculate the data file length during update.
2007-07-10 13:09:07 +05:00
tomas@whalegate.ndb.mysql.com
810db44e4f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-07-10 09:03:21 +02:00
tomas@whalegate.ndb.mysql.com
503f86f3ba
Bug #29570
...
- correct result files
2007-07-10 09:00:15 +02:00
tsmith@sita.local
63dd4251e4
Bug #29634 : mysqld_safe does not set err_log variable, error log file is not created
...
Dont touch & chmod the err_log file if using syslog (mysqld_safe)
2007-07-09 16:10:43 -06:00
tsmith@sita.local
0ed9e3eb4c
Merge sita.local:/Users/tsmith/m/bk/maint/50
...
into sita.local:/Users/tsmith/m/bk/maint/51
2007-07-09 15:45:13 -06:00
tsmith@sita.local
06c8087070
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into sita.local:/Users/tsmith/m/bk/maint/50
2007-07-09 15:38:36 -06:00
tsmith@sita.local
e345a242f4
mysqld_safe.sh:
...
Fix a few typos in comments (from Paul DuBois)
2007-07-09 15:30:19 -06:00
tsmith@sita.local
832eb83777
Merge sita.local:/Users/tsmith/m/bk/maint/50
...
into sita.local:/Users/tsmith/m/bk/maint/51
2007-07-09 13:28:37 -06:00
tsmith@sita.local
4b1da38b13
rpl_misc_functions.result, rpl_misc_functions.test:
...
Backport from 5.1 a fix to make this test deterministic
2007-07-09 13:18:27 -06:00
tsmith@sita.local
92cad567ba
Merge sita.local:/Users/tsmith/m/bk/maint/50
...
into sita.local:/Users/tsmith/m/bk/maint/51
2007-07-09 10:41:58 -06:00
tsmith@sita.local
59c570ba78
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into sita.local:/Users/tsmith/m/bk/maint/51
2007-07-09 10:33:33 -06:00
tsmith@sita.local
1e0d809992
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into sita.local:/Users/tsmith/m/bk/maint/50
2007-07-09 10:32:04 -06:00
istruewing@chilla.local
4b76695000
Merge chilla.local:/home/mydev/mysql-5.1-ateam
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-09 16:06:09 +02:00
svoj@june.mysql.com
c188110565
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG29464/mysql-5.1-engines
2007-07-09 16:07:08 +05:00
tomas@whalegate.ndb.mysql.com
278a5dfa83
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-07-09 12:17:47 +02:00
tomas@whalegate.ndb.mysql.com
14a20dad62
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-07-09 12:17:03 +02:00
tomas@whalegate.ndb.mysql.com
658d12aea8
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-07-09 12:15:52 +02:00
tomas@whalegate.ndb.mysql.com
b66fac4fc1
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-07-09 12:07:33 +02:00
tomas@whalegate.ndb.mysql.com
81eb732880
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
2007-07-09 12:05:07 +02:00
tsmith@sita.local
5cba44239a
disabled.def:
...
post-merge fix: re-enable rpl_udf test
2007-07-09 03:31:27 -06:00
tsmith@sita.local
5f12f35c34
Merge sita.local:/Users/tsmith/m/bk/51
...
into sita.local:/Users/tsmith/m/bk/maint/51
This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.
2007-07-09 03:27:03 -06:00
tsmith@sita.local
00c6793075
Merge sita.local:/Users/tsmith/m/bk/maint/41
...
into sita.local:/Users/tsmith/m/bk/maint/50
2007-07-09 01:47:33 -06:00
tomas@whalegate.ndb.mysql.com
7dd1f323a8
Bug #29570
...
- correct result files
2007-07-09 09:35:27 +02:00
tsmith@sita.local
7b2b10e462
Merge sita.local:/Users/tsmith/m/bk/50
...
into sita.local:/Users/tsmith/m/bk/maint/50
2007-07-09 01:22:54 -06:00
tsmith@sita.local
1106dddfa2
Merge sita.local:/Users/tsmith/m/bk/41
...
into sita.local:/Users/tsmith/m/bk/maint/41
2007-07-09 01:21:22 -06:00
tsmith@sita.local
75810fbc22
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into sita.local:/Users/tsmith/m/bk/maint/50
2007-07-09 01:14:33 -06:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
b37c24c439
after-merge fix.
2007-07-09 10:39:49 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
ede22768a9
Merge mysql.com:/home/ram/work/b28808/b28808.5.0
...
into mysql.com:/home/ram/work/b28808/b28808.5.1
2007-07-09 10:20:45 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a10759d070
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b28808/b28808.5.0
2007-07-09 10:17:04 +05:00
tsmith@sita.local
c2092ee91b
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into sita.local:/Users/tsmith/m/bk/maint/50
2007-07-08 19:39:54 -06:00
istruewing@chilla.local
043cf5bb4a
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-08 22:44:47 +02:00
istruewing@chilla.local
22ad965856
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-08 22:43:39 +02:00
istruewing@chilla.local
660c3fd239
Merge chilla.local:/home/mydev/mysql-5.1-ateam
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-08 22:41:49 +02:00
istruewing@chilla.local
f5fcc9de33
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-08 21:04:54 +02:00
istruewing@chilla.local
246d1d43cb
Merge chilla.local:/home/mydev/mysql-5.0-amain
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-08 21:04:08 +02:00
istruewing@chilla.local
cb88f63e75
Merge chilla.local:/home/mydev/mysql-5.0-ateam
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-08 21:03:02 +02:00
istruewing@chilla.local
10441bc78a
Merge chilla.local:/home/mydev/mysql-4.1-amain
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-07-08 19:47:08 +02:00
istruewing@chilla.local
cf016f84fa
Merge chilla.local:/home/mydev/mysql-4.1-ateam
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-07-08 19:46:22 +02:00
gshchepa/uchum@gleb.loc
eac626bde6
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-08 11:51:09 +05:00
gshchepa/uchum@gleb.loc
930f711b8f
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-08 11:48:57 +05:00
