dlenev@mockturtle.local
81c908f200
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-merge
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-24 22:15:14 +03:00
dlenev@mockturtle.local
37110aad7f
Disabling back im_daemon_life_cycle.test, which was temporarily enabled in
...
the team tree for additional investigation.
2007-01-24 22:11:27 +03:00
brian@zim.(none)
2ccd38169f
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-24 10:34:05 -08:00
brian@zim.(none)
099c634d62
This patch passes comment to be embedded in ARZ.
...
Fixes autodiscovery of tables.
Allows the FRM to be extracted from the ARZ file via archive_reader.
2007-01-24 10:30:06 -08:00
monty@narttu.mysql.fi
c022454e7c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-01-24 19:53:51 +02:00
istruewing@chilla.local
06a8c16f6f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug24607
2007-01-24 17:35:14 +01:00
dlenev@mockturtle.local
c762789096
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-merge
2007-01-24 19:33:06 +03:00
dlenev@mockturtle.local
86f36eb089
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-24 19:26:06 +03:00
sergefp@mysql.com
e2f0f4dbd3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug8804-r12
2007-01-24 19:13:28 +03:00
gluh@eagle.(none)
0e949c6ada
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-24 20:12:32 +04:00
gluh@mysql.com/eagle.(none)
a548a54c61
after merge fix
2007-01-24 20:11:36 +04:00
gluh@eagle.(none)
7b291e36cf
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-24 19:54:40 +04:00
gluh@mysql.com/eagle.(none)
a7acea61de
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-01-24 19:24:16 +04:00
istruewing@chilla.local
0dc064536f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug24607
2007-01-24 15:52:19 +01:00
istruewing@chilla.local
b9b3120580
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-bug24607
2007-01-24 15:47:04 +01:00
istruewing@chilla.local
e74331b3f7
After merge fix
2007-01-24 15:45:41 +01:00
gkodinov/kgeorge@macbook.gmz
7fd3cd9e41
Merge bk-internal:/home/bk/mysql-5.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
2007-01-24 15:57:58 +02:00
gkodinov/kgeorge@macbook.gmz
13238b0e3d
merge of 5.0-opt -> 5.1-opt
2007-01-24 15:55:16 +02:00
istruewing@chilla.local
1417840cb9
Merge chilla.local:/home/mydev/mysql-5.0-bug24607
...
into chilla.local:/home/mydev/mysql-5.1-bug24607
2007-01-24 13:32:36 +01:00
istruewing@chilla.local
23debf8662
Bug#24607 - MyISAM pointer size determined incorrectly
...
After merge fix
2007-01-24 13:29:46 +01:00
istruewing@chilla.local
050ddb2032
Merge chilla.local:/home/mydev/mysql-4.1-bug24607
...
into chilla.local:/home/mydev/mysql-5.0-bug24607
2007-01-24 13:26:06 +01:00
istruewing@chilla.local
928d672c46
Bug#24607 - MyISAM pointer size determined incorrectly
...
Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.
2007-01-24 13:17:01 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
8190cfca85
bug #22682 Test fails --without-geometry
...
geometry dependent parts moved to proper .test files
2007-01-24 14:49:36 +04:00
df@kahlann.erinye.com
09add20d4c
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2007-01-24 09:26:08 +01:00
df@kahlann.erinye.com
cb6c5f7ee7
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-24 09:24:52 +01:00
df@kahlann.erinye.com
729f015866
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
2007-01-24 09:24:29 +01:00
df@kahlann.erinye.com
9665651457
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2007-01-24 09:23:48 +01:00
svoj@june.mysql.com
a6de0419d4
Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
2007-01-24 11:56:18 +04:00
svoj@june.mysql.com
77515e27f7
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
2007-01-24 11:54:38 +04:00
svoj@mysql.com/june.mysql.com
0e5aa80e8a
After merge fix.
2007-01-24 11:53:09 +04:00
dlenev@mockturtle.local
a1376aa01b
Fixed test case after merging fix for bug#24491 "using alias from source
...
table in insert ... on duplicate key" in 5.1 tree.
2007-01-24 10:46:25 +03:00
dlenev@mockturtle.local
282501df21
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg24491
2007-01-24 10:42:57 +03:00
svoj@mysql.com/june.mysql.com
603dcb4d3f
Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
2007-01-24 11:41:13 +04:00
svoj@mysql.com/june.mysql.com
94d834c7b6
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
2007-01-24 11:40:45 +04:00
svoj@mysql.com/june.mysql.com
02212e6ace
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
2007-01-24 11:38:23 +04:00
stewart@willster.(none)
b0d94e9d35
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
2007-01-24 16:24:21 +11:00
stewart@willster.(none)
76d4191379
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
2007-01-24 16:16:16 +11:00
stewart@willster.(none)
4889ea2321
fix hpux build problem and some ndb connect errors being missed
2007-01-24 16:12:39 +11:00
tomas@poseidon.mysql.com
292ba83f40
Bug#25668 mysqld may core if cluster disconnected
...
- recommit in 4.1
2007-01-24 09:41:40 +07:00
tomas@poseidon.mysql.com
f869a0d605
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-01-24 09:13:47 +07:00
igor@olga.mysql.com
459f3cf18a
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-01-23 17:04:01 -08:00
istruewing@chilla.local
26153490ec
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug24607
2007-01-23 22:27:03 +01:00
mjorgensen@production.mysql.com
2e174533f0
Merge bk-internal:/home/bk/mysql-5.1
...
into production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build
2007-01-23 20:38:00 +01:00
istruewing@chilla.local
b381fd87bb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug24607
2007-01-23 20:19:19 +01:00
jonas@eel.(none)
1e0418cfa2
ndb - bug#25794
...
Fix read after delete (in same op)
- lqh, handling of attrinfo
- tup, setup read for disk/varchar
2007-01-23 19:27:55 +01:00
igor@olga.mysql.com
20279c1a7b
Post-merge fix.
2007-01-23 10:11:53 -08:00
igor@olga.mysql.com
ed3c1741d4
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-01-23 09:56:06 -08:00
gkodinov/kgeorge@rakia.gmz
ac25a49ff4
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B6172-5.1-opt
2007-01-23 19:48:53 +02:00
gkodinov/kgeorge@macbook.gmz
450e9b6b30
Bug #6172 : RAND(a) should only accept constant values as arguments
...
RAND() must accept scalar expressions regardless of their kind.
That includes both constant expressions and expressions that
depend on column values.
When the expression is constant the random seed can be initialized
at compile time.
However when the expression is not constant the random seed must be
initialized at each invocation (while it still can be allocated at
compile time).
Implemented the above rules by extending Item_func_rand::val_real()
to initialize the random seed at the correct place.
2007-01-23 19:45:58 +02:00
acurtis/antony@ltamd64.xiphis.org
37f76ab496
Merge xiphis.org:/home/antony/work2/p1-bug25396.4
...
into xiphis.org:/home/antony/work2/p1-bug25396.5
2007-01-23 08:34:50 -08:00