Commit graph

28999 commits

Author SHA1 Message Date
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
rparranovo@mysql.com
5775ad80e9 Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/novo/MySQL/mysql-5.0
2005-12-12 17:32:10 -03:00
rparranovo@mysql.com
ea54b05897 mysql.spec.sh:
* made the following changes for the generic 5.0 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:29:02 -03:00
jimw@mysql.com
00d29cd259 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-12 11:57:07 -08:00
aivanov@mysql.com
75af3821d7 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11
2005-12-12 22:46:49 +03:00
jimw@mysql.com
90befc0a0e Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 11:39:33 -08:00
knielsen@production.mysql.com
fca8b65672 Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
2005-12-12 20:10:39 +01:00
paul@snake-hub.snake.net
3a9c099ba3 Merge snake-hub.snake.net:/tmp/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2005-12-12 12:17:56 -06:00
paul@snake-hub.snake.net
c708d9140f mysqltest.c:
Put options in proper order.
2005-12-12 12:15:25 -06:00
jimw@mysql.com
e18679c7ff Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 10:11:56 -08:00
joerg@mysql.com
2a3d35fa02 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-12-12 19:11:21 +01:00
aivanov@mysql.com
7ae2d46903 Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for
table' lockup".
 Changes from the innodb-4.1-ss11 snapshot.
 Do not call os_file-create_tmpfile() at runtime. Instead, create
 a tempfile at startup and guard access to it with a mutex.
 Also, fix bugs:
 10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE";
 13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN
 KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that
 datatypes between foreign key references are compatible.
 Also, added test cases (also for bug 9802).
2005-12-12 21:06:59 +03:00
joerg@mysql.com
a86cb213f2 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/bug12429 2005-12-12 19:04:47 +01:00
joerg@mysql.com
99cf03b295 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
into mysql.com:/M50/clone-5.0
2005-12-12 19:00:08 +01:00
joerg@mysql.com
e8c6234ffd Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
into mysql.com:/M50/clone-5.0
2005-12-12 18:57:26 +01:00
joerg@mysql.com
36655f9a1e Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/bug12429 2005-12-12 18:54:35 +01:00
joerg@mysql.com
c256d035dd Merge mysql.com:/M50/bug12429 into mysql.com:/M51/merge-5.1 2005-12-12 18:50:00 +01:00
joerg@mysql.com
fd77b58ee8 Merge mysql.com:/M50/bug12429 into mysql.com:/M50/clone-5.0 2005-12-12 18:44:01 +01:00
joerg@mysql.com
62d726582e rpl_until.test + rpl_until.result Fix (completion) for bug#12429
Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
2005-12-12 18:00:37 +01:00
joerg@mysql.com
8dfe471426 rpl_until.test + rpl_until.result
Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.

Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com
2005-12-12 17:51:56 +01:00
jonas@perch.ndb.mysql.com
6f7ca617f5 ndb - bug#15685
Error in abort handling in TC when timeout during abort
2005-12-12 17:19:04 +01:00
kent@mysql.com
3e23de493a skip_name_resolve.result, skip_name_resolve.test:
Ignore columns with unpredictable values.
rpl_relayrotate.result:
  Changed result file to match change in test
2005-12-12 16:58:20 +01:00
kent@mysql.com
bbf65edaa9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2005-12-12 16:17:58 +01:00
kent@mysql.com
a6849a9238 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2005-12-12 16:12:36 +01:00
kent@mysql.com
ab882e0b5f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2005-12-12 15:49:41 +01:00
msvensson@neptunus.(none)
f356bf5615 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-12-12 15:48:34 +01:00
msvensson@neptunus.(none)
0705a2b1ca Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-12-12 15:22:25 +01:00
msvensson@neptunus.(none)
e0142f908e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/bug9535/my51-bug9535
2005-12-12 15:19:14 +01:00
knielsen@production.mysql.com
e76563a33d Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
2005-12-12 13:48:51 +01:00
ingo@mysql.com
3f9f19e34c Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-12 13:24:08 +01:00
dlenev@mysql.com
5ff3e4ec57 Merge mysql.com:/home/dlenev/src/mysql-5.0-merges
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
2005-12-12 14:59:14 +03:00
ramil@mysql.com
51184adde3 Fix for bug #15630: Test case failure in sp-dynamic, sp-error, and sp. 2005-12-12 15:57:35 +04:00
kent@mysql.com
51443fe422 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2005-12-12 12:30:18 +01:00
kent@mysql.com
2ec5b24d74 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-12 11:58:16 +01:00
anozdrin@mysql.com
de84d76299 Merge WL#2984 2005-12-12 13:29:48 +03:00
aivanov@mysql.com
c34595c975 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/dev/mysql-5.0-14614
2005-12-12 13:16:06 +03:00
knielsen@production.mysql.com
569ebd0a60 Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
2005-12-12 10:59:36 +01:00
ramil@mysql.com
351204834b Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  mysql.com:/usr/home/ram/work/mysql-5.0-release
2005-12-12 11:55:49 +04:00
igor@rurik.mysql.com
ede2e0d254 item_sum.h, item.cc:
Post review corrections in comments.
2005-12-11 22:21:19 -08:00
aivanov@mysql.com
a61b810508 Fixed BUG #14614: Replication of tables with trigger generates
error message if database is changed.
2005-12-11 17:06:36 +03:00
kent@mysql.com
43252fa1bb Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-12-11 09:23:38 +01:00
kent@mysql.com
cf57f12407 make_win_src_distribution.sh:
Removed Visual Studio 6 project files, as they are not maintained
2005-12-11 09:21:13 +01:00
igor@rurik.mysql.com
ad53d72033 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-12-10 23:31:03 -08:00
evgen@moonbone.local
2790489cd6 Fix bug #15268 Unchecked null value caused server crash
cmp_item_sort_string::cmp() wasn't checking values_res variable for null.
Later called function was dereferenced it and crashed server.

Added null check to cmp_item_sort_string::cmp().
2005-12-09 23:01:52 +03:00
ramil@mysql.com
cafbf5ac3b Fix for bug #15605: 5.0.17 test case 'mysqltest' failure. 2005-12-09 20:18:25 +04:00
ramil@mysql.com
8eba6be5b7 Fix for bug #15602: 5.0.17 test case 'create' failure. 2005-12-09 19:55:59 +04:00
kent@mysql.com
c7ef90400f Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-12-09 15:32:07 +01:00