cmiller@zippy.cornsilk.net
a35a8fe550
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
2007-12-10 15:28:17 -05:00
tsmith@ramayana.hindu.god
4eb097ba12
Add a way to remove options which mysql-test-run.pl no longer uses.
2007-12-07 14:43:31 -07:00
cmiller@zippy.cornsilk.net
34ca9adee7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-community
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
2007-12-07 11:52:41 -05:00
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
bf6292ea97
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-07 03:40:18 -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
b922c9646c
Fix compiler warning about wrong integer size (probably harmless)
2007-12-06 16:11:26 -07:00
tsmith@ramayana.hindu.god
44d74f631f
ctype-simple.c: Backport quick fix to remove Windows compiler warnings
2007-12-06 15:05:24 -07:00
kent@mysql.com/kent-amd64.(none)
b058fce73d
configure.in:
...
Merged missing change in the 5.0 community repository, --without-server
was not working if thread safe client was enabled (Bug#32898)
2007-12-06 10:23:58 +01:00
tsmith@ramayana.hindu.god
f1323ad628
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-05 15:29: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
tsmith@ramayana.hindu.god
6453025165
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/41
2007-12-04 19:16:22 -07:00
cmiller@zippy.cornsilk.net
2cdac34078
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-community
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
2007-12-04 08:51:58 -05: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)
0f0051e695
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-12-01 12:57:20 +03:00
kaa@polly.(none)
33125cd40e
Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code.
2007-12-01 12:46:25 +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
joerg/mysqldev@mysql.com/production.mysql.com
102cf43161
Merge bk-internal:/home/bk/mysql-5.0-community
...
into mysql.com:/data0/mysqldev/my/mysql-5.0-community
2007-11-30 19:27:29 +01: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
msvensson@pilot.mysql.com
f035f5e05d
Merge pilot.mysql.com:/data/msvensson/mysql/bug32429/my50-bug32429
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
2007-11-26 20:08:32 +01: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
thek@adventure.(none)
b894128b90
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-11-26 17:21:15 +01:00
davi@mysql.com/endora.local
cdad8669df
Bug#29592 SQL Injection issue
...
Remove the mysql_odbc_escape_string() function. The function
has multi-byte character escaping issues, doesn't honor the
NO_BACKSLASH_ESCAPES mode and is not used anymore by the
Connector/ODBC as of 3.51.17.
2007-11-26 14:09:37 -02:00
thek@adventure.(none)
0ca073c610
Merge adventure.(none):/home/thek/Development/cpp/bug32436/my50-bug32436
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-11-26 15:58:06 +01:00
thek@adventure.(none)
95bfde3d01
Bug #32436 KILL QUERY completely deadlocks mysqld
...
Sending several "KILL QUERY" statements to target a connection running
"SELECT SLEEP" could freeze the server.
The locking order in Item_func_sleep was wrong and this could lead to a
dead lock.
This patch solves the issue by resolving the locking order properly.
2007-11-26 15:44:05 +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
6c39d13209
BUG#31277 - myisamchk --unpack corrupts a table
...
Another try to fix a compiler warning on win64.
2007-11-26 14:48:49 +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
1d2a0d1d6e
BUG#31277 - myisamchk --unpack corrupts a table
...
Fixed a compiler warning on win64. Backport from 5.1.
2007-11-23 12:52:29 +01:00
istruewing@stella.local
17399e7be3
Bug#32651 - grant_cache.test fails
...
Disabled test case
2007-11-23 12:06:55 +01:00