tsmith@ramayana.hindu.god
8c5f194505
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-07 03:51:23 -07:00
tsmith@ramayana.hindu.god
6835272b37
Make tests more robust (clean up better after grant.test)
2007-12-07 03:39:37 -07:00
tsmith@ramayana.hindu.god
10cab933b2
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-04 20:58:21 -07:00
kaa@polly.(none)
0e78354baa
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-12-02 14:11:36 +03:00
kaa@polly.(none)
d905aade4f
Windows-specific fixes in floating point tests.
2007-12-02 13:49:12 +03:00
kaa@polly.(none)
2a52bb82e4
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-12-01 15:37:25 +03:00
kaa@polly.(none)
55acce7504
Fixed the floating point number tests on Windows.
2007-12-01 15:25:24 +03:00
kaa@polly.(none)
b994abb997
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-12-01 10:48:41 +03:00
kaa@polly.(none)
7fd9135bb8
Fix for bug #26788 "mysqld (debug) aborts when inserting specific
...
numbers into char fields" and bug #12860 "Difference in zero padding of
exponent between Unix and Windows"
Rewrote the code that determines what 'precision' argument should be
passed to sprintf() to fit the string representation of the input number
into the field.
We get finer control over conversion by pre-calculating the exponent, so
we are able to determine which conversion format, 'e' or 'f', will be
used by sprintf().
We also remove the leading zero from the exponent on Windows to make it
compatible with the sprintf() output on other platforms.
2007-12-01 10:05:59 +03:00
malff@lambda.hsd1.co.comcast.net.
7c4f906bf3
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-28 07:23:51 -07:00
davi@endora.local
7441f466e2
Merge mysql.com:/Users/davi/mysql/bugs/31479-5.0
...
into mysql.com:/Users/davi/mysql/mysql-5.0-runtime
2007-11-28 10:49:30 -02:00
davi@mysql.com/endora.local
bd3f76d767
Bug#31479 Bad lock interaction if CREATE TABLE LIKE is killed
...
Kill of a CREATE TABLE source_table LIKE statement waiting for a
name-lock on the source table causes a bad lock interaction.
The mysql_create_like_table() has a bug that if the connection is
killed while waiting for the name-lock on the source table, it will
jump to the wrong error path and try to unlock the source table and
LOCK_open, but both weren't locked.
The solution is to simple return when the name lock request is killed,
it's safe to do so because no lock was acquired and no cleanup is needed.
Original bug report also contains description of other problems
related to this scenario but they either already fixed in 5.1 or
will be addressed separately (see bug report for details).
2007-11-28 10:18:01 -02:00
istruewing@stella.local
02e321d350
Bug#29149 Test "kill" fails on Windows
...
Disabled test case.
2007-11-28 09:48:06 +01:00
istruewing@stella.local
777d79f5fd
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 18:42:59 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e2fa11fb50
after-merge fixup: archive test/result adjusted.
2007-11-27 21:30:00 +04:00
istruewing@stella.local
c389535ae9
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 17:34:03 +01:00
istruewing@stella.local
a167dd0bf4
Bug#8693 Test 'rpl_log_pos' fails sometimes
...
Disabled the test case.
2007-11-27 17:28:55 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
f03fb473b3
Merge mysql.com:/home/ram/work/mysql-5.0-engines
...
into mysql.com:/home/ram/work/b30495/b30495.5.0
2007-11-27 20:03:09 +04:00
malff@lambda.hsd1.co.comcast.net.
352e59b37b
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-27 08:56:43 -07:00
istruewing@stella.local
a39180c1f2
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 16:24:44 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
14e74e82e8
Merge mysql.com:/home/ram/work/mysql-5.0-engines
...
into mysql.com:/home/ram/work/b30495/b30495.5.0
2007-11-27 15:15:28 +04:00
istruewing@stella.local
f140e7e000
Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
...
Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
Fixed wrong variable assignment.
2007-11-26 19:16:23 +01:00
istruewing@stella.local
a7aa278482
Bug#32357 - ndb_backup_print test fails sometimes in pushbuild
...
Disabled test case
2007-11-26 14:49:41 +01:00
istruewing@stella.local
2cc3e56ea4
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-25 14:14:52 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7a41acfd40
Merge mysql.com:/home/ram/work/mysql-5.0-engines
...
into mysql.com:/home/ram/work/b32560/b32560.5.0
2007-11-23 17:24:54 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
51ca3235b8
Fix for bug #32560 : crash with interval function and count(*)
...
Problem: INTERVAL function implementation doesn't handle NULL range values.
Fix: skip NULL ranges looking for a proper one.
2007-11-23 16:30:06 +04:00
istruewing@stella.local
a1c5fef49a
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-23 13:09:01 +01:00
istruewing@stella.local
3b09d3708a
Bug#32654: rpl_view.test fails randomly
...
Disabled test case
2007-11-23 13:03:38 +01:00
istruewing@stella.local
695afd5d07
Bug#32653 - rpl_log.test fails randomly
...
Disabled test case
2007-11-23 12:54:05 +01:00
istruewing@stella.local
17399e7be3
Bug#32651 - grant_cache.test fails
...
Disabled test case
2007-11-23 12:06:55 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
a13b5e9d80
Merge mysql.com:/home/ram/work/mysql-5.0-engines
...
into mysql.com:/home/ram/work/b32558/b32558.5.0
2007-11-23 13:04:13 +04:00
davi@endora.local
9817d93edb
Merge endora.local:/Users/davi/mysql/bugs/32528-5.0
...
into endora.local:/Users/davi/mysql/mysql-5.0-runtime
2007-11-22 10:20:12 -02:00
davi@endora.local
351c474153
Bug#32528 Global read lock with a low priority write lock causes a server crash
...
FLUSH TABLES WITH READ LOCK fails to properly detect write locked
tables when running under low priority updates.
The problem is that when trying to aspire a global read lock, the
reload_acl_and_cache() function fails to properly check if the thread
has a low priority write lock, which later my cause a server crash or
deadlock.
The solution is to simple check if the thread has any type of the
possible exclusive write locks.
2007-11-22 10:18:19 -02:00
mkindahl@dl145h.mysql.com
3cf2733086
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2007-11-21 21:11:57 +01:00
istruewing@stella.local
0d76c73fd5
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-21 20:30:07 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
924bdf2c78
Fix for bug #32558 : group by null-returning expression with rollup causes crash
...
Problem: setting Item_func_rollup_const::null_value property to argument's null_value
before (without) the argument evaluation may result in a crash due to wrong null_value.
Fix: use is_null() to set Item_func_rollup_const::null_value instead as it evaluates
the argument if necessary and returns a proper value.
2007-11-21 20:53:44 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
725b2d35f4
Fix for bug #30495 : optimize table t1,t2,t3 extended errors
...
Problem: we have CHECK TABLE options allowed (by accident?) for
ANALYZE/OPTIMIZE TABLE.
Fix: disable them.
Note: it might require additional fixes in 5.1/6.0
2007-11-21 11:11:22 +04:00
tnurnberg@white.intern.koehntopp.de
3c0f1ef341
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/misc/mysql/24907/50-24907
2007-11-17 19:13:27 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
6889c82997
Bug#24907: unpredictable (display) precission, if input precission increases
...
Server failed in assert() when we tried to create a DECIMAL() temp field
with a scale of more than the allowed 30. Now we limit the scale to the
allowed maximum. A truncation warning is thrown as necessary.
2007-11-17 19:05:31 +01:00
istruewing@stella.local
a0aad59f03
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-16 13:27:23 +01:00
joerg@trift2.
61a9d77784
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-11-16 10:42:32 +01:00
gluh@mysql.com/eagle.(none)
b56f668ca3
after merge fix
2007-11-14 18:56:14 +04:00
joerg@trift2.
86674bc412
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-11-14 15:26:38 +01:00
istruewing@stella.local
398caa9ad8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into stella.local:/home2/mydev/mysql-5.0-bug4692
2007-11-14 14:42:11 +01:00
gluh@eagle.(none)
246c6c35a9
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-11-14 17:26:22 +04:00
istruewing@stella.local
43a5312157
Bug#4692 - DISABLE/ENABLE KEYS waste a space
...
Post-pushbuild fix
Added a purecov comment and a test for coverage of parallel
enable keys.
2007-11-14 12:02:20 +01:00
svoj@june.mysql.com
b4ad73d079
Merge mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-5.0-engines
2007-11-14 14:38:26 +04:00
svoj@mysql.com/june.mysql.com
107822cf87
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines
2007-11-14 14:30:21 +04:00
svoj@mysql.com/june.mysql.com
7f9298b919
Merge mysql.com:/home/svoj/devel/mysql/BUG29083/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines
2007-11-14 14:29:49 +04:00
mkindahl@dl145h.mysql.com
a8bbce6569
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
2007-11-14 11:19:34 +01:00