kent@mysql.com
8e5b353598
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 16:50:28 +01:00
ingo@mysql.com
b24a5e1360
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0
2005-12-14 16:37:02 +01:00
mskold@mysql.com
138ec21cc9
Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable
2005-12-14 16:29:56 +01:00
aivanov@mysql.com
c6f658d09e
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss28
2005-12-14 18:08:56 +03:00
jonas@perch.ndb.mysql.com
2059a6c174
bug#15682 - ndb
...
incorrect handling of varchar in position/rnd_pos
Commit for 5.0.17 release clone
2005-12-14 15:09:12 +01:00
ingo@mysql.com
374c6b3301
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0
2005-12-14 14:51:22 +01:00
mskold@mysql.com
0663f81acd
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-12-14 14:49:59 +01:00
mskold@mysql.com
973dedbf08
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-12-14 14:48:42 +01:00
mskold@mysql.com
c08ee431bd
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-12-14 14:46:24 +01:00
mskold@mysql.com
b0500f54c8
Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable
2005-12-14 14:45:13 +01:00
jonas@perch.ndb.mysql.com
b5b0a3d6ac
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2005-12-14 14:03:50 +01:00
knielsen@production.mysql.com
16e86df69e
Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/knielsen/mysql-5.0
2005-12-14 14:00:35 +01:00
knielsen@mysql.com
44012d40f2
Remove unused class member as suggested by Guilhem.
2005-12-14 13:51:11 +01:00
knielsen@mysql.com
bf5a72e3f5
Merge mysql.com:/usr/local/mysql/mysql-mawk
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2005-12-14 13:24:26 +01:00
knielsen@mysql.com
7454718c61
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2005-12-14 13:20:30 +01:00
kent@mysql.com
c11b35d9bf
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 13:18:24 +01:00
knielsen@mysql.com
6a2dfba63b
Merge mysql.com:/usr/local/mysql/mysql-mawk
...
into mysql.com:/usr/local/mysql/mysql-5.0
2005-12-14 13:16:36 +01:00
kent@mysql.com
45b81ac196
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 13:09:41 +01:00
knielsen@mysql.com
a3eea41f0d
BUG#15734: Fix undefined awk behaviour breaking compilation on Debian.
2005-12-14 13:09:37 +01:00
jonas@perch.ndb.mysql.com
b7c11c87b2
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-12-14 12:55:02 +01:00
ingo@mysql.com
615cac19dc
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0
2005-12-14 12:47:15 +01:00
hartmut@mysql.com
23900c47d8
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-14 12:12:26 +01:00
jonas@perch.ndb.mysql.com
6a02895276
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-12-14 11:34:08 +01:00
jani@hundin.mysql.fi
b846c5463b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into hundin.mysql.fi:/home/jani/mysql-5.1-new
2005-12-14 12:32:58 +02:00
jonas@perch.ndb.mysql.com
ae66c0b6d1
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2005-12-14 11:10:56 +01:00
jonas@perch.ndb.mysql.com
4454e7a631
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2005-12-14 11:06:40 +01:00
jonas@perch.ndb.mysql.com
1864165ff3
bug#15682 - ndb - invalid handling of varchar in position/rnd_pos
2005-12-14 10:57:09 +01:00
ingo@mysql.com
97e3b90f65
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-14 10:40:49 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
c9bad32ab5
Removed wrong merge from 5.0 - 5.1
2005-12-14 10:29:00 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
2ed8d82c61
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-12-14 09:42:05 +02:00
knielsen@production.mysql.com
1b846dc2fd
Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/knielsen/mysql-5.0
2005-12-14 08:24:57 +01:00
jonas@perch.ndb.mysql.com
b0eec760bf
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-12-14 06:59:37 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
834940e9be
Patch for Bug#13640
2005-12-14 03:08:59 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
f845256f89
Disabled test. Fails in ps-protocol mode.
2005-12-14 02:56:34 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b7c52afb57
Disabled archive db for Netware.
2005-12-14 02:08:48 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
3069276592
Datadir variable should not be reset, if it was
...
set in this script.
2005-12-14 02:01:54 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
37010dba85
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-12-14 01:38:10 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e8438b9319
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-12-14 01:29:39 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
96f8db34a5
Netware specific changes.
2005-12-14 01:21:56 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
4ac4020f6d
Fixed test case.
2005-12-14 00:23:46 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
bb6c11bf3b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-12-14 00:20:55 +02:00
aivanov@mysql.com
645805385d
Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92
...
into mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss92
2005-12-13 23:56:22 +03:00
evgen@moonbone.local
012933ce39
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/15268-bug-5.0-mysql
2005-12-13 23:26:35 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
f263c2f5a5
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-12-13 21:55:58 +02:00
aivanov@mysql.com
11073be8d0
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92
2005-12-13 22:29:36 +03:00
hartmut@mysql.com
84929a0f43
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-13 19:50:23 +01:00
aivanov@mysql.com
2e499986aa
Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for
...
table' lockup".
Changes from the innodb-5.0-ss92 snapshot.
Do not call os_file_create_tmpfile() at runtime. Instead, create
all tempfiles at startup and guard access to them with mutexes.
2005-12-13 21:35:24 +03:00
jonas@perch.ndb.mysql.com
7db9b21297
ndb - merge fix
2005-12-13 19:21:02 +01:00
paul@snake-hub.snake.net
d6f2ca8818
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2005-12-13 11:47:05 -06:00
jani@a193-229-222-105.elisa-laajakaista.fi
7ded800078
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-12-13 19:46:35 +02:00