Commit graph

26050 commits

Author SHA1 Message Date
dlenev@mysql.com
603dddfdb4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg11896
2005-08-23 09:15:05 +04:00
jimw@mysql.com
447988759f Reorder server startup so that network startup is done after storage
engine startup. (Bug )
2005-08-22 18:07:42 -07:00
igor@rurik.mysql.com
21b63441f5 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-22 17:46:21 -07:00
jimw@mysql.com
9c44047f87 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-4.1-11707
2005-08-22 17:39:49 -07:00
igor@rurik.mysql.com
bbd04e6bcf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-22 17:33:59 -07:00
igor@rurik.mysql.com
94166de5f3 sql_show.cc:
Database name was set incorrectly for any show command
  that used sunqueries in its where condition.
information_schema.test, information_schema.result:
  Added a test case for bug .
2005-08-22 17:32:02 -07:00
jimw@mysql.com
f70beef6c7 Use the hostname with which the user authenticated when determining which
user to update with 'SET PASSWORD = ...'. (Bug )
2005-08-22 15:48:50 -07:00
hartmut@mysql.com
d74a148172 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-08-22 23:03:24 +02:00
hartmut@mysql.com
8859ab64d1 added file missing from release to EXTRA_DIST list (bug# 12733) 2005-08-22 22:13:56 +02:00
jimw@mysql.com
247e9421fa Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-22 11:54:33 -07:00
jimw@mysql.com
bb4af4f176 Merge mysql.com:/home/jimw/my/mysql-5.0-12689
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-22 10:19:09 -07:00
monty@mishka.local
ef06534945 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-08-22 19:58:11 +03:00
monty@mishka.local
7767828b81 Don't write first even that contains server version 2005-08-22 19:56:36 +03:00
igor@rurik.mysql.com
8c34d8e578 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-22 09:40:10 -07:00
konstantin@mysql.com
fb7be5270f Add a comment about I_List<> copy constructor. 2005-08-22 19:23:01 +04:00
konstantin@mysql.com
c75cfc358e Fix a -ansi -pedantic compile failure. 2005-08-22 18:59:47 +04:00
timour@mysql.com
310afc80dd Test case for BUG#10646
The bug itself is fixed by WL .
2005-08-22 17:34:08 +03:00
timour@mysql.com
c04138ec94 Test case for BUG#6558 - Views: create fails with JOIN ... USING
The bug is non-view specific, and it resulted from incorrect
name resolution of natural join result columns. The bug is
fixed by WL#2486.
2005-08-22 17:04:55 +03:00
hf@deer.(none)
bded7c984b Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.9645
2005-08-22 18:24:17 +05:00
monty@mishka.local
49413542bd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-08-22 16:06:00 +03:00
evgen@moonbone.local
3831bb56df Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/11718-bug-4.1-mysql
2005-08-22 15:46:14 +04:00
evgen@moonbone.local
f5f6ed8b78 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/11398-bug-5.0-mysql
2005-08-22 15:46:09 +04:00
tomas@poseidon.ndb.mysql.com
1e1a5762d6 posr review fixes of prev patch 2005-08-22 13:36:55 +02:00
jonas@eel.(none)
05fdd166f0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-22 13:35:00 +02:00
joerg@mysql.com
ddcbf609c4 Ensure that a failing test does not stop testing or the whole RPM build process. 2005-08-22 12:48:01 +02:00
osku@127.(none)
216227d8a2 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-22 12:53:54 +03:00
tomas@poseidon.ndb.mysql.com
6f27675dfc generalized option for specifying ndb distribution 2005-08-22 11:41:37 +02:00
jonas@eel.(none)
f4f63f0351 ndb -
Fix merge error
2005-08-22 11:34:33 +02:00
jonas@eel.(none)
d7349750e5 ndb - bug#12220
forgott to add KeyDescriptor.hpp
2005-08-22 11:25:03 +02:00
serg@sergbook.mysql.com
eadb86d56f after pull cleanup 2005-08-22 13:20:02 +04:00
jonas@eel.(none)
90256d31d1 bug#12220 - ndb - node recovery with charsets
LQH computes incorrect hash values during NR (as it doesn't concider charsets)

  Solution: make LQH compute correct hash :-)
           1) move xfrm_key into SimulatedBlock so that there's _one_ impl.
           2) make TC, ACC, LQH use same impl.
2005-08-22 10:59:25 +02:00
hf@deer.(none)
45b07fd422 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.9645
2005-08-22 13:08:44 +05:00
monty@mishka.local
d62295e44e Cleanup during review of new pushed code 2005-08-22 01:13:37 +03:00
jonas@eel.(none)
a58c0e7dae Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-21 16:35:27 +02:00
jonas@eel.(none)
daec6e5ebd Merge eel.(none):/home/jonas/src/mysql-4.1-push
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-21 16:24:53 +02:00
jonas@eel.(none)
5823c91f88 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-21 16:22:08 +02:00
monty@mishka.local
ba2ace25a9 Merge mishka.local:/tmp/skr99/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-08-21 13:05:15 +03:00
elliot@mysql.com
d9e3ad09e5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
2005-08-20 22:33:45 -04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
dce31760e4 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-08-20 21:21:49 -04:00
sasha@asksasha.com
e038bfe8ff Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
2005-08-20 16:09:59 -06:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
33811ac3a3 Fixed back some bin log writes to avoid merge problems
Added missing #ifdef for partitioning
2005-08-20 16:56:54 -04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
4084c13605 Merge c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-08-20 16:38:55 -04:00
serg@sergbook.mysql.com
573a7f5cc1 be standard (I_S.TABLES: s/TEMPORARY/LOCAL &/) 2005-08-20 20:15:30 +04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
5340e04661 Bug Table Full
On 64 bit platforms the changed statement doesn't work
so making sure that the larger value is first and using
subtraction is a quick and backwards-compatible fix of this
line.
2005-08-20 10:07:46 -04:00
serg@sergbook.mysql.com
117d61c8a0 Merge bk-internal:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-08-20 14:38:18 +04:00
monty@mishka.local
1c1f26d5e2 Fixes during review of new pushed code
Fixed new bug when running a SP without a default database
2005-08-20 11:00:00 +03:00
stewart@mysql.com
9a3168da82 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug10950
2005-08-20 17:58:33 +10:00
igor@rurik.mysql.com
1730f26caf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-19 22:06:43 -07:00
igor@rurik.mysql.com
c4f677feb5 Manual merge 2005-08-19 20:21:09 -07:00
jimw@mysql.com
6240210305 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-19 17:53:48 -07:00