Commit graph

28567 commits

Author SHA1 Message Date
aivanov@mysql.com
5f7279d0d5 Applied patch recieved from Marko:
Make innodb_thread_concurrency 0 by default, and extend the usable
 range from 0 to 1000 (0 disables the thread throttling).
2006-01-18 15:20:56 +03:00
aivanov@mysql.com
af9d6bcf83 Applied patch recieved from Marko:
Make innodb_flush_log_at_trx_commit a settable global variable.
2006-01-18 15:02:03 +03:00
joerg@mysql.com
5e69a370c4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/merge-5.0
2006-01-18 10:44:00 +01:00
joerg@mysql.com
f4d4cc6e7b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/merge-5.0
2006-01-18 09:26:48 +01:00
serg@serg.mylan
87f685edef Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-17 21:12:24 +01:00
msvensson@neptunus.(none)
e55af5271c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-17 19:46:02 +01:00
konstantin@mysql.com
8d6c98ed90 Bug#15206: "Misleading message "No data to FETCH":
reword the misleading message.
2006-01-17 21:10:47 +03:00
msvensson@neptunus.(none)
f729ad7d39 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-17 19:08:07 +01:00
msvensson@neptunus.(none)
8b243b3799 Fix for connection not being added to connection pool if "disable_abort_on_error" was used. 2006-01-17 19:02:42 +01:00
serg@serg.mylan
80f190e349 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-17 17:25:10 +01:00
pem@mysql.com
ef68a070f2 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0
2006-01-17 14:44:22 +01:00
pem@mysql.com
ba01e04a2c Post-review fix. (BUG#15231) 2006-01-17 12:48:48 +01:00
jani@hundin.mysql.fi
2df00e30f2 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jani/mysql-5.0
2006-01-17 13:47:41 +02:00
pem@mysql.com
7817b99857 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0
2006-01-17 12:44:51 +01:00
joerg@mysql.com
802c578c97 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/merge-5.0
2006-01-17 11:23:19 +01:00
jani@hundin.mysql.fi
1466160239 Merge jani@193.229.222.105:/my/bk/mysql-5.0
into  hundin.mysql.fi:/home/jani/mysql-5.0
2006-01-17 11:49:46 +02:00
pem@mysql.com
2f44b60752 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0
2006-01-17 10:04:11 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
0168444a6f 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
2006-01-17 10:44:20 +02:00
jani@hundin.mysql.fi
8b7bfe1430 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jani/mysql-5.0
2006-01-17 01:42:12 +02:00
konstantin@mysql.com
4fd615abdb A post-merge fix. 2006-01-17 01:22:01 +03:00
konstantin@mysql.com
c05b3f3bb1 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-01-17 01:18:00 +03:00
konstantin@mysql.com
59b1c9c87a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/opt/local/work/mysql-4.1-root
2006-01-17 01:13:55 +03:00
konstantin@mysql.com
739ba76d64 A fix for Bug#13337 "ps test fails if configure wo/ usc2" 2006-01-17 01:03:03 +03:00
konstantin@mysql.com
34c37d1ac9 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-01-17 00:44:43 +03:00
konstantin@mysql.com
3d16758311 A test case for Bug#6073 "ALTER TABLE minor glitch" (can't repeat) 2006-01-17 00:28:00 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
41ff5c80da Changed condition similar to code in 4.1. 2006-01-16 23:15:00 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
6eef05344f 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
2006-01-16 22:55:50 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b948c2941d 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
2006-01-16 21:31:22 +02:00
konstantin@mysql.com
f693473fff A test case for Bug#7670 "Loss of precision for some integer
values stored into DOUBLE column" (Can't repeat)
2006-01-16 22:31:13 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2659e797ed 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
2006-01-16 21:23:29 +02:00
serg@serg.mylan
ae3d815b41 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-16 18:09:04 +01:00
pem@mysql.com
5863337b8f Post-merge fixes (BUG#14498) 2006-01-16 17:55:22 +01:00
joerg@mysql.com
5da306b57e extra/comp_err.c : Fix a merge error. 2006-01-16 17:23:39 +01:00
msvensson@neptunus.(none)
905fdbf195 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug6554/my50-bug6554
2006-01-16 17:18:34 +01:00
joerg@mysql.com
fa91e05bf5 Manual merge of the fix for bug#16106.
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
2006-01-16 16:48:05 +01:00
andrey@lmy004.
7b2238d484 Merge 2006-01-16 16:21:41 +01:00
knielsen@mysql.com
638aef7fa5 Merge mysql.com:/usr/local/mysql/mysql-5.x-win-test-fixes
into  mysql.com:/usr/local/mysql/mysql-5.0-win-test-fixes
2006-01-16 15:48:55 +01:00
pem@mysql.com
559a243686 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0
2006-01-16 15:37:25 +01:00
knielsen@mysql.com
1b75cf8aa6 Two minor fixes to be able to run tests from within a Windows Max
build directory.
2006-01-16 15:25:15 +01:00
pem@mysql.com
a1b2960a8a Post-review fix (BUG#14498). 2006-01-16 15:22:29 +01:00
msvensson@neptunus.(none)
9c2a5cc8ba Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug6554/my50-bug6554
2006-01-16 14:46:25 +01:00
aivanov@mysql.com
442dcf8be7 Restore fix for bug #15108 (by ramil) erroneously erased
by applying innodb-5.0-ss115 snapshot.
2006-01-16 15:23:02 +03:00
msvensson@neptunus.(none)
8238f355dc Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554
2006-01-16 13:10:14 +01:00
aivanov@mysql.com
0efdc24a99 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss115
2006-01-16 14:50:27 +03:00
msvensson@neptunus.(none)
81cef460b1 Merge bk-internal:/home/bk/mysql-4.0
into  neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554
2006-01-16 12:48:16 +01:00
msvensson@neptunus.(none)
19fd64d1e6 Merge neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554
into  neptunus.(none):/home/msvensson/mysql/bug6554/my50-bug6554
2006-01-16 12:47:48 +01:00
msvensson@neptunus.(none)
e795f369c4 Merge neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554
into  neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554
2006-01-16 12:46:07 +01:00
aivanov@mysql.com
708f9b3ceb Changes from the innodb-5.0-ss115 snapshot.
Fixed bugs:
 BUG#15991: "innodb-file-per-table + symlink database + rename = crash"
 BUG#15650: "DELETE with LEFT JOIN crashes server"
 BUG#15308: "Problem of Order with Enum Column in Primary Key"
 BUG#14189: "VARBINARY and BINARY variables: trailing space ignored"
2006-01-16 14:32:43 +03:00
msvensson@neptunus.(none)
b54920bce7 BUG#6554 Problem Building MySql on Fedora Core 3
- Remove the local static var
2006-01-16 12:17:30 +01:00
knielsen@mysql.com
e5598d2fad Windows Visual Studio 2003 fixes. 2006-01-16 09:56:10 +01:00