msvensson@neptunus.(none)
8c3be395f7
After merge
2006-03-08 10:40:29 +01:00
msvensson@neptunus.(none)
8a977e4b38
Merge neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137
...
into neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
2006-03-08 10:17:12 +01:00
msvensson@neptunus.(none)
8162610a39
Bug#17137 Running "truncate table" on temporary table leaves the table open on a slave
...
- Decrease "slave_open_temp_tables" during reopen of truncated table.
- Add test "rpl_trunc_temp"
2006-03-08 10:15:48 +01:00
aelkin@mysql.com
42cc473df3
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-14 20:19:00 +02:00
aelkin@mysql.com
6423fe2d49
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-14 20:15:17 +02:00
evgen@moonbone.local
131217eb6f
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/16272-bug-5.0-mysql
2006-02-14 19:46:35 +03:00
aelkin@mysql.com
bce89a9f5b
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-14 15:26:01 +02:00
evgen@moonbone.local
8f904e9cab
Fixed bug#16272: IF function with decimal args can produce wrong result
...
The Item_func_if::fix_length_and_dec() function when calculating length of
result doesn't take into account unsigned_flag. But it is taken when
calculating length of temporary field. This result in creating field that
shorter than needed. Due to this, in the reported query 40.0 converted to 9.99.
The function Item_func_if::fix_length_and_dec() now adds 1 to the max_length if
the unsigned_flag isn't set.
2006-02-14 16:22:37 +03:00
aelkin@mysql.com
5bd5967bdb
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-14 12:44:26 +02:00
aelkin@mysql.com
4f85993945
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-14 12:42:27 +02:00
evgen@moonbone.local
84a775ca3c
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/16752-bug-5.0-mysql
2006-02-14 11:33:46 +03:00
bar@mysql.com
561d7a03aa
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.cs_fs
2006-02-14 08:25:09 +04:00
bar@mysql.com
cc3623aecf
Many files:
...
Backporting character_set_filesystem from 5.0 to 5.1.
2006-02-14 08:24:01 +04:00
aelkin@mysql.com
9321f6747c
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-13 23:38:12 +02:00
aelkin@mysql.com
1603a83120
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-13 23:36:23 +02:00
aelkin@mysql.com
a5da4ce669
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
2006-02-13 22:00:11 +02:00
aelkin@mysql.com
a744ab78ba
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
2006-02-13 21:47:23 +02:00
aelkin@mysql.com
0d54c27d50
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-13 21:37:32 +02:00
joerg@mysql.com
678e075ecf
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/rpmspec-4.1
2006-02-13 18:23:08 +01:00
paul@snake-hub.snake.net
78f4f94059
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
2006-02-13 11:22:49 -06:00
paul@snake-hub.snake.net
5f2a401dba
set_var.cc:
...
Fix out-of-order system variable.
2006-02-13 11:20:15 -06:00
aelkin@mysql.com
e7a0822a47
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
2006-02-13 19:17:02 +02:00
aelkin@mysql.com
0866e4267a
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
2006-02-13 19:15:02 +02:00
aelkin@mysql.com
312f68133c
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-13 19:13:33 +02:00
joerg@mysql.com
47746b12c4
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/rpmspec-5.0
2006-02-13 18:04:30 +01:00
SergeyV@selena.
d19e124d98
Merge selena.:H:/MYSQL/bkt/mysql-4.1
...
into selena.:H:/MYSQL/bkt/mysql-5.0
2006-02-13 17:51:22 +03:00
SergeyV@selena.
b0136378cf
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into selena.:H:/MYSQL/src/#06536-mysql-4.1
2006-02-13 17:29:35 +03:00
tomas@poseidon.ndb.mysql.com
ce04588ca8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-13 14:32:04 +01:00
brian@zim.tangent.org
f43fa4a688
Discoved while debugging in 5.1 that there was a bug where a certain crash could lead to two problems. 1) An additional share in memory that was allocated but did not have the correct use_count (so it would never be fulled deleted). Also discovered that a thread that called repair would write new rows, but would not see them. All other threads were ok, and the data was fine, but the thread doing the repair was unable to see the new rows.
2006-02-13 04:11:22 -08:00
tomas@poseidon.ndb.mysql.com
4f449e4f22
ndb:
...
add optional reporting of of a "name" tied to a nodeid in the cluster log
reporting added for mysql server and ndb_restore
2006-02-13 12:58:12 +01:00
kent@mysql.com
f9a23667b2
Merge
2006-02-12 04:33:50 +01:00
kent@mysql.com
30b8a9c1fb
spatial.cc:
...
Added { ... } around float8get() macro, avoids VC7 error
message "illegal else without matching if"
mtr_report.pl:
Parse error logs to create "warnings" file
mtr_cases.pl:
Added optoion --ignore-disabled-def
Windows build now let TZ pass, removed
work around
mysql-test-run.pl, mtr_process.pl:
Back port of changes from 5.0
2006-02-12 04:13:24 +01:00
kent@mysql.com
1fe9126dc2
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-02-12 01:35:30 +01:00
kent@mysql.com
eec5726806
make_binary_distribution.sh:
...
print => echo in shell script
2006-02-12 01:33:43 +01:00
knielsen@mysql.com
9025342992
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/mysql/mysql-4.1-fixrace
2006-02-12 00:19:59 +01:00
knielsen@mysql.com
5346bf7392
Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-02-12 00:10:43 +01:00
kent@mysql.com
c94b3638f1
Merge
2006-02-11 23:44:56 +01:00
kent@mysql.com
2619c54bd1
mysql-test-run.{pl,sh}:
...
Give space for second and third slave port
2006-02-11 23:35:23 +01:00
knielsen@mysql.com
43189fd8ad
Fix a race on some platforms in mysql-test-run.pl, where it would sometimes
...
errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.
2006-02-11 22:50:59 +01:00
kent@mysql.com
5fe2e8fd7d
mysql-test-run.pl:
...
Display instance manager port
mysql-test-run.sh:
Give port space for more than one slave
2006-02-10 19:56:34 +01:00
kent@mysql.com
f8e08f38fe
Merge
2006-02-10 19:47:46 +01:00
kent@mysql.com
d23d02be18
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-02-10 19:18:45 +01:00
tomas@poseidon.ndb.mysql.com
9663f6cbee
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-10 18:16:34 +01:00
joerg@mysql.com
49caf76e59
support-files/mysql.spec.sh : Manual merge: new "-i" in "make -i test-force", changelog.
2006-02-10 18:07:14 +01:00
tomas@poseidon.ndb.mysql.com
5ba3f69f3e
manual merge
2006-02-10 17:59:53 +01:00
tomas@poseidon.ndb.mysql.com
cbac75de91
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2006-02-10 17:53:13 +01:00
tomas@poseidon.ndb.mysql.com
27a14f93eb
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-10 17:50:17 +01:00
tomas@poseidon.ndb.mysql.com
7050a7586e
Bug #17249 ndb, delete statement with join where clause fails when table do not have pk
...
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key
change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
2006-02-10 17:40:22 +01:00
joerg@mysql.com
ceaf0017e3
support-files/mysql.spec.sh : Use "-i" on "make test-force", essential for log file evaluation.
2006-02-10 17:40:04 +01:00
andrey@lmy004.
bdf0f9a2d9
fix test of bug 12744 on OSX
2006-02-10 14:42:08 +01:00