istruewing@chilla.local
3f0bfd831a
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-28 17:06:09 +02:00
istruewing@chilla.local
20bb4ae8cf
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-28 16:59:09 +02:00
istruewing@chilla.local
350c5da724
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-28 16:57:08 +02:00
istruewing@chilla.local
9470f149b6
After merge fix
2007-03-28 12:11:44 +02:00
istruewing@chilla.local
a2d7a05f88
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-03-28 10:25:51 +02:00
istruewing@chilla.local
1201f653e5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-03-28 10:20:46 +02:00
istruewing@chilla.local
fd8ebd5657
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-03-28 08:59:30 +02:00
istruewing@chilla.local
2ce22c3f6f
Merge chilla.local:/home/mydev/mysql-4.1-bug26231
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-03-28 08:57:46 +02:00
istruewing@chilla.local
bba96f35c8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug24985
2007-03-28 08:51:12 +02:00
istruewing@chilla.local
e5f50abcd9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug24985
2007-03-27 21:19:25 +02:00
tomas@whalegate.ndb.mysql.com
c86293e41e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-27 18:12:33 +02:00
istruewing@chilla.local
f90c056b5c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-bug24985
2007-03-27 17:59:49 +02:00
istruewing@chilla.local
49884979b4
Merge chilla.local:/home/mydev/mysql-5.0-bug24985
...
into chilla.local:/home/mydev/mysql-5.1-bug24985
2007-03-27 12:46:54 +02:00
istruewing@chilla.local
01be61e307
Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
...
causes incorrect duplicate entries
After merge fix
2007-03-27 12:39:31 +02:00
joerg@trift-lap.fambruehe
336f03d151
Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-03-27 12:06:13 +02:00
istruewing@chilla.local
ef1dec00c4
Merge chilla.local:/home/mydev/mysql-4.1-bug24985
...
into chilla.local:/home/mydev/mysql-5.0-bug24985
2007-03-27 10:54:37 +02:00
istruewing@chilla.local
8934e4f3cc
Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
...
causes incorrect duplicate entries
Keys for BTREE indexes on ENUM and SET columns of MEMORY tables
with character set UTF8 were computed incorrectly. Many
different column values got the same key value.
Apart of possible performance problems, it made unique indexes
of this type unusable because it rejected many different
values as duplicates.
The problem was that multibyte character detection was tried
on the internal numeric column value. Many values were not
identified as characters. Their key value became blank filled.
Thanks to Alexander Barkov and Ramil Kalimullin for the patch,
which sets the character set of ENUM and SET key segments to
the pseudo binary character set.
2007-03-27 10:49:48 +02:00
tomas@whalegate.ndb.mysql.com
1bae3e5726
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-26 21:13:46 +02:00
pekka@clam.(none)
5f061a7e5c
Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
...
into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
2007-03-25 15:06:19 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
ccb9d448f3
BUG#26257 New Federated Server Functionality Doesn't support differently named tables
...
* Modified Federated memory allocation to use MEM_ROOT
* Modified sql_servers and federated to allocate share connection
parameters to use MEM_ROOT
* Modified Federated to allow tablename in addition to server name
* Implicit flushing of tables using altered/dropped server name
* Added tests to prove new functionality works
Contributors to this patch: Patrick Galbraith, Antony Curtis
2007-03-24 01:18:19 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
14ccc65994
Bug#25721
...
"Concurrent ALTER/CREATE SERVER can lead to deadlock"
Deadlock caused by inconsistant use of mutexes in sql_server.cc
One mutex has been removed to resolve deadlock.
Many functions were made private which should not be exported.
Unused variables and function removed.
2007-03-23 17:31:27 -07:00
tomas@whalegate.ndb.mysql.com
ac0da397db
rpl_ndb_sync.result, ndb_partition_key.result:
...
test case
2007-03-23 21:49:49 +01:00
serg@sergbook.mysql.com
77718a3fc1
bug in im* tests - missing --no-defaults in the mysql command line
2007-03-23 22:16:32 +02:00
joerg@trift2.
751531fca7
mysql-test/t/query_cache_sql_prepare.test : Prevent this test from running in "embedded".
2007-03-23 17:31:10 +01:00
tomas@whalegate.ndb.mysql.com
972837350b
result file updates, message format changes
2007-03-23 17:22:52 +01:00
tomas@whalegate.ndb.mysql.com
78dce2dd97
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 17:17:44 +01:00
tomas@whalegate.ndb.mysql.com
41dfbb6f2b
enabled and extended single user test
2007-03-23 17:14:38 +01:00
serg@sergbook.mysql.com
1d64408cd5
Merge bk-internal:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
2007-03-23 16:32:42 +02:00
tomas@poseidon.mysql.com
210d055000
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-23 13:10:58 +01:00
joerg@trift2.
a1ffb00288
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-03-23 11:13:15 +01:00
joerg@trift2.
4ab912c92a
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-03-23 11:10:27 +01:00
joerg@trift2.
2e5e79cf37
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-03-23 10:57:17 +01:00
istruewing@chilla.local
af850a24f8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug26996
2007-03-23 08:28:21 +01:00
tomas@whalegate.ndb.mysql.com
05984c7aeb
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 08:20:36 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
e06a8826c9
fixes to make embedded-server test working
2007-03-23 10:16:30 +04:00
omer@linux.site
cbdd03c5d5
Merge linux.site:/home/omer/source/bld50_0321
...
into linux.site:/home/omer/source/bld51_0322
2007-03-22 14:49:25 -07:00
holyfoot/hf@mysql.com/hfmain.(none)
7eb78d8d04
merging
2007-03-23 01:46:02 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
e1044ab5d1
merging
2007-03-23 01:04:31 +04:00
istruewing@chilla.local
a009d2dd6f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug26996
2007-03-22 21:34:31 +01:00
holyfoot/hf@hfmain.(none)
a7f5f07b6f
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-23 00:09:12 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
fc23f3356e
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-23 00:04:47 +04:00
holyfoot/hf@hfmain.(none)
81b59fb3cc
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-22 23:59:20 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
68f9ff123c
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-22 23:54:47 +04:00
holyfoot/hf@hfmain.(none)
09d4529457
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-22 23:49:44 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0102d38ef4
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-22 23:48:39 +04:00
evgen@moonbone.local
b1f852b901
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
2007-03-22 22:15:21 +03:00
evgen@moonbone.local
1ac5987ae2
Bug#26813: The SUPER privilege is wrongly required to alter a view created by
...
another user.
When the DEFINER clause isn't specified in the ALTER statement then it's loaded
from the view definition. If the definer differs from the current user then
the error is thrown because only a super-user can set other users as a definers.
Now if the DEFINER clause is omitted in the ALTER VIEW statement then the
definer from the original view is used without check.
2007-03-22 22:05:19 +03:00
gkodinov/kgeorge@magare.gmz
70d91d43ae
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B26207-5.0-opt
2007-03-22 18:49:47 +02:00
gkodinov/kgeorge@magare.gmz
ef1bb48af9
Bug #26207 : When making the key image to use
...
in index search MySQL was not explicitly
suppressing warnings. And if the context
happens to enable warnings (e.g. INSERT ..
SELECT) the warnings resulting from converting
the data the key is compared to are
reported to the client.
Fixed by suppressing warnings when converting
the data to the same type as the key parts.
2007-03-22 18:44:16 +02:00
mhansson/martin@linux-st28.site
99ac24679d
Bug#24791: Union with AVG-groups generates wrong results
...
Patch appled after doing a pull from the team tree. Additional tests had to be
fixed
2007-03-22 14:58:43 +01:00