igor@rurik.mysql.com
e2feeb88f9
Made the test case for bug #15917 independent on platforms.
2006-04-10 14:14:20 -07:00
igor@rurik.mysql.com
406b29b6e0
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-10 13:04:25 -07:00
bell@sanja.is.com.ua
ff698513e5
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2006-04-10 22:00:03 +03:00
bell@sanja.is.com.ua
5fe95af804
Avoid trying to include <asm/atomic.h> when it doesn't work in C++
...
code. (Bug #13621 )
2006-04-10 21:57:29 +03:00
ingo@mysql.com
5824ec03e1
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2006-04-10 20:48:10 +02:00
knielsen@mysql.com
030c170550
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/mysql-5.0-tmp
2006-04-10 20:48:09 +02:00
aivanov@mysql.com
31727db005
Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868
...
into mysql.com:/home/alexi/bugs/mysql-5.0-15868-work
2006-04-10 22:48:08 +04:00
aivanov@mysql.com
6ad6cda2ca
Fixed test case result (after BUG#15868 fix).
2006-04-10 22:44:01 +04:00
jimw@mysql.com
fec9005e87
Merge mysql.com:/home/jimw/my/mysql-5.0-13601
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-10 11:23:30 -07:00
knielsen@mysql.com
4088329ba0
Merge mysql.com:/usr/local/mysql/mysql-5.0-fixcast
...
into mysql.com:/usr/local/mysql/mysql-5.0-tmp
2006-04-10 17:58:22 +02:00
ingo@mysql.com
1c0f675377
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2006-04-10 17:58:21 +02:00
knielsen@mysql.com
1f9d96430d
Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfix
...
into mysql.com:/usr/local/mysql/mysql-5.0-tmp
2006-04-10 17:58:21 +02:00
aivanov@mysql.com
aeeb19920d
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/bugs/mysql-5.0-15868
2006-04-10 19:58:20 +04:00
aivanov@mysql.com
bb94bb30d0
Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread thrashing'.
...
Applied changes due Heikki Tuuri.
2006-04-10 19:47:41 +04:00
msvensson@neptunus.(none)
6b1f72c1a7
Merge 192.168.0.20:mysql/bug15069/my50-bug15069
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-10 15:13:30 +02:00
msvensson@shellback.(none)
475e1f6a53
Bug#15069 [patch] my_print_defaults does'nt care --sysconfdir
...
- Grab the path from "configure --sysconfdir=<path>" and set it as
the first place to look for my.cnf files
Do this both in Makefiles for libmysql and mysys
- Patch provided by Francesco Riosa. Thank you!
2006-04-10 15:11:37 +02:00
knielsen@mysql.com
587627b1fc
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/mysql/mysql-4.1
2006-04-10 13:05:35 +02:00
jonas@perch.ndb.mysql.com
775527103d
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-04-10 10:30:27 +02:00
jonas@perch.ndb.mysql.com
e4e61b091a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-10 09:56:57 +02:00
knielsen@mysql.com
b9d427ca27
Fix test case 'cast' on Windows, different floating point output format.
2006-04-10 09:31:46 +02:00
jonas@perch.ndb.mysql.com
7e0733fedc
Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-10 08:29:24 +02:00
jonas@perch.ndb.mysql.com
5b38711760
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-10 08:27:59 +02:00
aelkin@dl145k.mysql.com
f5c527972f
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145k.mysql.com:/tmp/andrei/5.0.21-bug17284-temp_table
2006-04-09 18:14:30 +02:00
aivanov@mysql.com
61c7e4bac5
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/bugs/mysql-5.0-15758
2006-04-09 20:14:29 +04:00
aelkin@mysql.com
cbee6eca95
BUG#18906 Test case rpl_temporary fails when using --vardir option
...
env variable name is fixed.
2006-04-09 13:27:53 +03:00
lars@mysql.com
ab71e2ac99
Merge mysql.com:/users/lthalmann/bk/mysql-5.0-release-bug18116
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2006-04-09 10:40:52 +02:00
knielsen@mysql.com
32940fc3cb
Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfix
...
into mysql.com:/usr/local/mysql/mysql-4.1
2006-04-09 00:22:05 +02:00
knielsen@mysql.com
4d5ab7a961
$MYSQL_TEST was broken with --valgrind.
2006-04-08 22:27:43 +02:00
bell@sanja.is.com.ua
ba424aacb0
Check tinfo library presence and use it. (BUG#18912)
2006-04-08 23:19:52 +03:00
igor@rurik.mysql.com
17141582d4
Fixed bug #16069 .
...
The function agg_cmp_type in item_cmpfunc.cc neglected the fact that
the first argument in a BETWEEN/IN predicate could be a field of a view.
As a result in the case when the retrieved table was hidden by a view
over it and the arguments in the BETWEEN/IN predicates are of
the date/time type the function did not perform conversion of
the constant arguments to the same format as the first field argument.
If formats of the arguments differed it caused wrong a evaluation of
the predicates.
2006-04-08 11:42:09 -07:00
aelkin@mysql.com
010a8a5728
#18906 : bushbuild reports rpl_temporary fails on solaris, AIX, QNX
...
Removing the problematic line from include test file.
2006-04-08 16:29:11 +03:00
aelkin@dl145j.mysql.com
61377e953d
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145j.mysql.com:/tmp/5.0.21-bug17284-temp_table
2006-04-07 22:42:55 +02:00
igor@rurik.mysql.com
fb3b768205
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2006-04-07 13:07:40 -07:00
aivanov@mysql.com
612266ec90
Fixed BUG#15758: "Holding adaptive search latch in
...
innobase_query_caching_of_table_permitted()".
Applied the patch due to Heikki Tuuri.
Also removed superfluous #ifdefs.
2006-04-07 23:58:17 +04:00
konstantin@mysql.com
a81ea4a830
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-4.1-16365
2006-04-07 23:50:45 +04:00
konstantin@mysql.com
518993312c
A fix and a test case for Bug#16365 "Prepared Statements: DoS with
...
too many open statements". The patch adds a new global variable
@@max_prepared_stmt_count. This variable limits the total number
of prepared statements in the server. The default value of
@@max_prepared_stmt_count is 16382. 16382 small statements
(a select against 3 tables with GROUP, ORDER and LIMIT) consume
100MB of RAM. Once this limit has been reached, the server will
refuse to prepare a new statement and return ER_UNKNOWN_ERROR
(unfortunately, we can't add new errors to 4.1 without breaking 5.0). The limit is changeable after startup
and can accept any value from 0 to 1 million. In case
the new value of the limit is less than the current
statement count, no new statements can be added, while the old
still can be used. Additionally, the current count of prepared
statements is now available through a global read-only variable
@@prepared_stmt_count.
2006-04-07 23:37:06 +04:00
joerg@mysql.com
f8d524cdbc
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mtr-4.1
2006-04-07 21:07:53 +02:00
konstantin@mysql.com
15b591561f
A fix and a test case for Bug#16248 "WHERE (col1,col2) IN ((?,?))
...
gives wrong results". Implement previously missing
Item_row::cleanup. The bug is not repeatable in 5.0, probably
due to a coincidence: the problem is present in 5.0 as well.
2006-04-07 22:26:25 +04:00
joerg@mysql.com
a0c3f51c10
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mtr-5.0
2006-04-07 20:26:12 +02:00
aelkin@mysql.com
bfbd922eb8
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.21-bug17284-temp_table
2006-04-07 21:21:23 +03:00
joerg@mysql.com
4a5985e694
Manual merge.
2006-04-07 19:50:07 +02:00
aelkin@mysql.com
d881fb36b9
Bug#17284 erroneous temp table cleanup on slave.
...
Idea of the fix is for master to send FD event with `created' as 0
to reconnecting slave (upon slave_net_timeout, no master crash) to avoid destroying temp tables.
In a case of a connect by slave to the master after its crash temp tables have been already
cleaned up so that slave can not keep `orphan' temp tables.
2006-04-07 20:44:37 +03:00
joerg@mysql.com
657d1bd182
Manual merge.
2006-04-07 19:42:46 +02:00
joerg@mysql.com
a7edbc647e
mysql-test/mysql-test-run.sh : Provide info about the options used.
2006-04-07 19:27:19 +02:00
igor@rurik.mysql.com
f053b7c9d0
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2006-04-07 10:19:09 -07:00
jonas@perch.ndb.mysql.com
739b0d676b
ndb - bug#11034
...
fix mem leak (not during running of transactions, but a few bytes when shutting down)
2006-04-07 17:10:56 +02:00
pem@mysql.com
739ee02cf6
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/generic/mysql-5.0-runtime
2006-04-07 16:55:49 +02:00
pem@mysql.com
bf548fb916
Renaming sp_pcontext members and methods; less cryptic and more consistent.
...
Also added comments, and fixing some coding style (mostly in comments too).
There are no functional changes, so no tests or documentation needed.
(This was originally part of a bugfix, but it was decided to not include this
in that patch; instead it's done separately.)
2006-04-07 16:53:15 +02:00
jonas@perch.ndb.mysql.com
7cd90d0081
ndb - bug#11033
...
silent valgrind warnings 5.0, ndb_autodiscover
2006-04-07 15:48:13 +02:00
msvensson@neptunus.(none)
0d98d97170
Remove #if 0
2006-04-07 14:21:00 +02:00