dkatz@damien-katzs-computer.local
c67c49fff0
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50_win
2007-06-13 15:47:34 -04:00
dkatz@damien-katzs-computer.local
1481bfc87b
Bug #28897 UUID() returns non-unique values when query cache is enabled
...
Removed the ability to cache queries containing "UUID()".
2007-06-13 14:23:25 -04:00
ramil/ram@ramil.myoffice.izhnet.ru
87e7709fae
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b28748/b28748.5.0
2007-06-13 14:21:44 +05:00
cmiller@zippy.cornsilk.net
da33797903
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
2007-06-12 10:33:39 -04:00
cmiller@zippy.cornsilk.net
33c59b5d02
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
2007-06-12 08:48:30 -04:00
cmiller@zippy.cornsilk.net
4c9af55908
Bug#28984: crasher on connect with out of range password length in \
...
protocol
Fixed duplicated code, same as last commit.
One could send a malformed packet that caused the server to SEGV. In
recent versions of the password protocol, the client tells the server
what length the ciphertext is (almost always 20). If that length was
large enough to overflow a signed char, then the number would jump to
very large after being casted to unsigned int.
Instead, cast the *passwd char to uchar.
2007-06-12 08:47:36 -04:00
kaa@polly.local
780a3dae0c
Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-06-12 11:42:39 +04:00
kaa@polly.local
0f5a1e5910
Fix for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
...
In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.
2007-06-11 23:06:20 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e570a72b13
Fix for bug #28748 : "Select" returning one value too few
...
Problem: we may get unexpected results comparing [u]longlong values as doubles.
Fix: adjust the test to use integer comparators.
Note: it's not a real fix, we have to implement some new comparators
to completely solve the original problem (see my comment in the bug report).
2007-06-09 17:13:33 +05:00
cmiller@zippy.cornsilk.net
f0dd5d9cf1
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/41gca
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
2007-06-08 17:06:29 -04:00
cmiller@zippy.cornsilk.net
3ab51acf6a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-06-08 16:52:40 -04:00
cmiller@zippy.cornsilk.net
4584ac2c73
Bug #28984 : crasher on connect with out of range password length in \
...
protocol
One could send a malformed packet that caused the server to SEGV. In
recent versions of the password protocol, the client tells the server
what length the ciphertext is (almost always 20). If that length was
large enough to overflow a signed char, then the number would jump to
very large after being casted to unsigned int.
Instead, cast the *passwd char to uchar.
2007-06-08 16:10:53 -04:00
msvensson@pilot.(none)
32eff42f73
Turn off use of bin log when running with embedded server
2007-06-08 16:20:24 +02:00
msvensson@pilot.(none)
38d73beb4e
Bug#28369 rpl test cases fail with binlog disabled
...
- Backport include/show_binlog_events.inc from 5.1 and use it to make
the test output consistent results
2007-06-08 11:30:03 +02:00
msvensson@pilot.(none)
9ed0e74db3
Bug#28369 rpl test cases fail with binlog disabled
2007-06-08 07:16:36 +02:00
msvensson@pilot.(none)
e5b5b8bb8f
Bug#28718 Running backup testcase fails in mysql testsuite of MySQL-enterprise-5.0.40
...
- Fix test to work on OS where backslashes are forward
2007-06-07 23:18:19 +02:00
msvensson@pilot.(none)
599ec2f825
Remove "is_debug_build.inc" and use already existing "have-debug.inc"
2007-06-07 22:23:47 +02:00
msvensson@pilot.(none)
597c75d2fd
Fix typo
...
Mark one more test as needing binlog
2007-06-07 20:25:22 +02:00
msvensson@pilot.(none)
c0144886bf
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-07 19:37:58 +02:00
msvensson@pilot.(none)
b8d8e494cd
Merge pilot.(none):/data/msvensson/mysql/bug28369/my50-bug28369
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-07 19:21:01 +02:00
msvensson@pilot.(none)
1afb1c8ddf
Bug#28369 rpl test cases fail with binlog disabled
...
- Turn on binlog only for tests that need it
- Skip those tests if --skip-binlog is used
2007-06-07 19:18:01 +02:00
Reggie@xp.
e0dd20b5a8
setting pre-commit to be Unix only line endings so it will work on Windows
2007-06-07 10:14:47 -05:00
"Reggie"/Reggie@xp.
64878d0c79
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into xp.:C:/work/mysql-5.0-maint
2007-06-07 09:53:01 -05:00
"Reggie"/Reggie@xp.
e4963e7c37
Bug #24731 Shared memory connections do not work with MySql ran as service on Vista
...
The events were not being opened in the global namespace.
2007-06-07 09:13:56 -05:00
msvensson@pilot.(none)
9aa732f1ce
Merge pilot.(none):/data/msvensson/mysql/bug28718/my50-bug28718
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-07 14:33:13 +02:00
msvensson@pilot.(none)
91b2650735
Bug#28718 Running backup testcase fails in mysql testsuite
...
- Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR
2007-06-07 14:25:17 +02:00
msvensson@pilot.(none)
ee9e271420
Merge pilot.(none):/data/msvensson/mysql/bug28690/my50-bug28690
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-07 10:00:23 +02:00
msvensson@pilot.(none)
b5ebfe45ed
Bug#28690 mysql-enterprise-gpl-5.0.40-linux-i686-glibc won't start on Debian Sarge
...
- Only use the "hack for bug in NTPL" if using NTPL, by dynamically
checking the thd_lib_detected flag
2007-06-07 09:48:37 +02:00
msvensson@pilot.(none)
7368985cfa
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-07 09:21:33 +02:00
msvensson@pilot.(none)
65919873ff
Merge pilot.(none):/data/msvensson/mysql/bug10218/my41-bug10218
...
into pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
2007-06-07 09:21:20 +02:00
kaa@polly.local
c674243497
Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-06-07 10:26:04 +04:00
tsmith@quadxeon.mysql.com
d2fe24d1ef
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
2007-06-05 23:04:40 +02:00
tsmith@quadxeon.mysql.com
173d07de78
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
2007-06-05 22:47:14 +02:00
kaa@polly.local
35dd1fc535
Fix for bug #28895 "Test 'information_schema_db' fails on i5/OS 32 bit".
...
In acl_getroot_no_password(), use a separate variable for traversing the acl_users list so that the last entry is not used when no matching entries are found.
2007-06-05 22:18:07 +04:00
tsmith@quadxeon.mysql.com
502320ef05
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
2007-06-05 17:28:49 +02:00
iggy@amd64.(none)
9317cd4c2d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into amd64.(none):/src/bug24400/my41-bug24400
2007-06-04 13:02:41 -04:00
iggy@amd64.(none)
2e892d30f2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into amd64.(none):/src/bug24400/my50-bug24400
2007-06-04 12:56:15 -04:00
iggy@amd64.(none)
9346e9246a
Merge amd64.(none):/src/bug24400/my41-bug24400
...
into amd64.(none):/src/bug24400/my50-bug24400
2007-06-04 12:47:48 -04:00
msvensson@pilot.(none)
5df790445a
Bug#10218 Command line recall rolls into Segmentation Fault(coredump)'
...
- Declare 'tgoto' if not already declared in system header files.
2007-06-04 16:42:42 +02:00
mhansson@dl145s.mysql.com
d9fcc304d9
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741
2007-06-04 09:26:54 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
9be267cbf2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b28652/b28652.5.0
2007-06-04 10:37:43 +05:00
igor@olga.mysql.com
44b46b73f2
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
2007-06-03 07:58:07 -07:00
evgen@moonbone.local
27d956b5e9
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
2007-06-03 16:00:04 +04:00
evgen@moonbone.local
88147d5cfe
user_var.result:
...
Corrected test case result for the bug#28494.
item_func.h, item_func.cc:
Corrected function names after fix for the bug#28494.
2007-06-03 15:56:48 +04:00
evgen@moonbone.local
5d695b777a
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
2007-06-03 14:46:37 +04:00
evgen@moonbone.local
7dbe9d3318
user_var.result, user_var.test:
...
Extended test case for the bug#28494.
2007-06-03 14:46:09 +04:00
igor@olga.mysql.com
cc0eff3e63
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
2007-06-03 00:21:42 -07:00
gkodinov/kgeorge@macbook.gmz
8fd809bfd8
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B26162-5.0-opt
2007-06-03 10:03:37 +03:00
gkodinov/kgeorge@macbook.gmz
9a1d8adc9d
Bug #26162 : Trigger DML ignores low_priority_updates setting
...
The value of "low-priority-updates" option and the LOW PRIORITY
prefix was taken into account at parse time.
This caused triggers (among others) to ignore this flag (if
supplied for the DML statement).
Moved reading of the LOW_PRIORITY flag at run time.
Fixed an incosistency when handling
SET GLOBAL LOW_PRIORITY_UPDATES : now it is in effect for
delayed INSERTs.
Tested by checking the effect of LOW_PRIORITY flag via a
trigger.
2007-06-03 09:40:00 +03:00
iggy@amd64.(none)
bc651da095
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into amd64.(none):/src/bug24732/my50-bug24732
2007-06-02 21:26:49 -04:00