Commit graph

29342 commits

Author SHA1 Message Date
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
andrey@lmy004.
831569cb2d WL#1034 (update)
- fixed silly bug, the main thread restarted but did not execute events,
  Quite currious why many calls to pthread_mutex_init() do not lead to abort()
2005-12-13 23:10:29 +01: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
andrey@lmy004.
ba79f499e6 WL#1034 update
(cleanups, leaks fixed)
2005-12-13 19:16:00 +01:00
msvensson@neptunus.(none)
b38a183d62 Remove confusing printouts from expected to fail "system" commands 2005-12-13 18:47:34 +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
msvensson@neptunus.(none)
b5d805b2d6 Remove confusing printout 2005-12-13 18:10:53 +01:00
msvensson@neptunus.(none)
36c86a4df6 Fix tests after merge
Straighten out and comment behaviour for --require and --result in run_query
2005-12-13 18:07:13 +01: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
msvensson@neptunus.(none)
2dbb3bc2ef Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2005-12-13 15:14:18 +01: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
andrey@lmy004.
854d2d4bcd WL#1034 update
cleanup before throwin away DYNAMIC_ARRAY for event storage,
once reallocated I get dangling pointers so that's not good.
solution will be found however ;)
2005-12-13 13:21:11 +01: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
kent@mysql.com
9f399bbabd my_pthread.h:
Bug#15629: Increased thread stack for all 64 bit platforms,
  else test case 'sp' and 'call fib(20)' gives stack overrun
2005-12-13 00:45:32 +01:00
jimw@mysql.com
e36df26e5b Fix sp.result after merge 2005-12-12 14:53:47 -08:00
knielsen@production.mysql.com
4c275451ca Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
2005-12-12 21:48:53 +01:00
rparranovo@mysql.com
acc6609bfd * made the following changes for the generic 5.1 RPM spec file
- Added zlib to the list of (static) libraries installed
- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
- Compile MySQL with bundled zlib
- Fixed %packager name to "MySQL Production Engineering Team"
2005-12-12 17:45:54 -03:00