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
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
jani@a193-229-222-105.elisa-laajakaista.fi
13d7abe06f
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-12-13 18:44:20 +02:00
jonas@perch.ndb.mysql.com
530e22edbf
Bug#15675 - ndb - fix read_multi_range.test drop all tables it using
...
NOTE: only changes to test script
2005-12-13 17:33:19 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
32466b14fb
Minor Netware specific changes.
2005-12-13 18:30:10 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
2692cdb071
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-12-13 18:22:00 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e16230b3ce
Increased stack size for clients on Netware.
...
New libc suggests doing this.
2005-12-13 17:53:26 +02:00
aivanov@mysql.com
594eb6cf6c
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11
2005-12-13 17:38:40 +03:00
aivanov@mysql.com
124b76c5a8
Changes from the innodb-5.1-ss28 snapshot.
...
Removed include/Makefile.am and the reference to it.
Deleted db/db0err.h and db directory.
Check index column sizes in a better way (bug 13315).
Fixed comments for memory allocation functions and added
some extra checks. Adapted callers.
2005-12-13 16:49:24 +03:00
jonas@perch.ndb.mysql.com
86ff121759
ndb - merge error
...
note bug#15629 has been fixed in release clone (sp on 64 bit platform), but not merged here yet
2005-12-13 14:41:28 +01:00
aivanov@mysql.com
ba09e4c004
Null-merge from 4.1
2005-12-13 16:29:31 +03:00
aivanov@mysql.com
d1d161ec2c
Merge mysql.com:/home/alexi/mysql-4.1
...
into mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11
Null merge
2005-12-13 16:12:56 +03:00
ramil@mysql.com
fa5f802746
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/usr/home/ram/work/mysql-5.0-release
2005-12-13 16:49:37 +04:00
jonas@perch.ndb.mysql.com
eae7c39a5c
Update ndb version in configure.in
2005-12-13 12:12:41 +01:00
jonas@perch.ndb.mysql.com
1ef416199a
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-13 12:07:36 +01:00
jonas@perch.ndb.mysql.com
522ba61027
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-13 11:58:46 +01:00
jonas@perch.ndb.mysql.com
57360b6b0d
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-12-13 11:54:42 +01:00
jonas@perch.ndb.mysql.com
2738871583
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-12-13 11:48:26 +01:00
jonas@perch.ndb.mysql.com
dc6220bd47
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-13 11:45:42 +01:00
knielsen@mysql.com
c1551bf94d
BUG#15624: Use --real_sleep in rpl_deadlock.test to avoid breaking when run with --sleep.
2005-12-13 11:42:10 +01:00
ramil@mysql.com
8f1b038e72
Fix for bug#15209: MySQL installation problem on Windows ME.
2005-12-13 12:20:05 +04:00
knielsen@production.mysql.com
79eb655d66
Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/knielsen/mysql-5.0
2005-12-13 06:45:22 +01:00
kent@mysql.com
7fe1a4038c
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-12-13 00:47:11 +01:00