tsmith@siva.hindu.god
c01629a7cd
Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/51
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-28 11:47:28 -06:00
kaa@polly.local
bec6c3056a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-03-28 21:21:22 +04:00
msvensson@pilot.blaudden
c9724dde8a
Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my51-yassl_import2
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 18:48:36 +02:00
msvensson@pilot.blaudden
04c4cdde1c
Import yaSSL
2007-03-28 18:47:51 +02:00
msvensson@pilot.blaudden
80f35d6307
Merge pilot.blaudden:/home/msvensson/mysql/bug27490/my51-bug27490
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 18:43:49 +02:00
kaa@polly.local
68aa95446e
Merge polly.local:/tmp/maint/bug26844/my51-bug26844
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-03-28 20:39:34 +04:00
msvensson@pilot.blaudden
b95a1819bf
Merge pilot.blaudden:/home/msvensson/mysql/bug27490/my50-bug27490
...
into pilot.blaudden:/home/msvensson/mysql/bug27490/my51-bug27490
2007-03-28 18:37:27 +02:00
tsmith@siva.hindu.god
e64da592ce
Bug #26262 : Add option to skip binary logging for mysqlcheck
...
Add the --skip-write-binlog option, which adds NO_WRITE_TO_BINLOG
to REPAIR, ANALYZE, and OPTIMIZE commands.
Use this option when these SQL commands should not be sent to
replication slaves, nor run when using the binary logs for recovery
from backup
2007-03-28 10:19:10 -06:00
kaa@polly.local
33358a5be6
Merge polly.local:/tmp/maint/bug26844/my50-bug26844
...
into polly.local:/tmp/maint/bug26844/my51-bug26844
2007-03-28 20:10:41 +04:00
msvensson@pilot.blaudden
1ccf651a3a
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 15:57:27 +02:00
msvensson@pilot.blaudden
c2bbf3c05e
Add back the look for exe_mysql
2007-03-28 15:56:57 +02:00
msvensson@pilot.blaudden
f8b3241726
Set yaSSL to use same type as MySQL do for socket handles
2007-03-28 15:34:52 +02:00
msvensson@pilot.blaudden
6969acd293
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 11:17:08 +02:00
msvensson@pilot.blaudden
1577caab52
Turn off im if extern
...
Remove strange comment
Add run_query function
2007-03-28 11:16:50 +02:00
msvensson@pilot.blaudden
184fef6303
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 10:24:47 +02:00
msvensson@pilot.blaudden
5901765694
Dont' redirect stderr in ActiveState perl
...
Improve comments
2007-03-28 10:24:33 +02:00
msvensson@pilot.blaudden
feac555a63
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 10:18:35 +02:00
msvensson@pilot.blaudden
b82b20cd83
Bug#27490 Function to log to NT event log could allocate memory
...
- Change 'print_buffer_to_nt_event_log' to overwrite the string
if the buffer is not long enough to hold the ending CR/LF's
- Make functions static
- Remove the "hack" intended to force 'print_buffer_to_nt_event_log'
never to use "new"
2007-03-28 10:12:33 +02:00
msvensson@pilot.blaudden
a1a664ebf7
Use mtr_verbose instead of "if ($opt_verbose)"
2007-03-28 10:08:26 +02:00
msvensson@pilot.blaudden
164397e71f
Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my51-bug25197
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 09:35:03 +02:00
msvensson@pilot.blaudden
8c5be6a220
Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-28 09:34:04 +02:00
msvensson@pilot.blaudden
bed4cb75e4
Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
...
into pilot.blaudden:/home/msvensson/mysql/bug25197/my51-bug25197
2007-03-28 09:33:16 +02:00
msvensson@pilot.blaudden
171e91f17d
Bug#25197 repeat function returns null when using table field directly as count
...
- Add extra test case from bug#27073
- Change "if" to be optimized for count > 0
2007-03-28 09:32:49 +02:00
msvensson@pilot.blaudden
2600dade72
Remove remnants of ssl_des.test
2007-03-27 21:29:45 +02:00
msvensson@pilot.blaudden
631476e1f3
Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my51-bug27022
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-27 21:12:59 +02:00
msvensson@pilot.blaudden
c083a8fdd5
Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my50-bug27022
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-27 21:12:32 +02:00
msvensson@pilot.blaudden
4d99906ea7
Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my50-bug27022
...
into pilot.blaudden:/home/msvensson/mysql/bug27022/my51-bug27022
2007-03-27 21:11:22 +02:00
cmiller@zippy.cornsilk.net
2490731d5b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-03-27 12:16:16 -04:00
cmiller@zippy.cornsilk.net
94c4c966f8
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27047/my50-prece-bug27047
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-03-27 11:34:16 -04:00
cmiller@zippy.cornsilk.net
bfbafe4c8e
Bug#26600: table PROFILING in INFORMATION SCHEMA has wrong data type
...
Bug#27047[partial]: INFORMATION_SCHEMA table cannot have BIGINT \
fields
No Information_schema table has ever needed floating-point data
before. Transforming all floating point to a string and back to a
number causes a real data problem on Windows, where the libc may
pad the exponent with more leading zeroes than we expect and the
significant digits are truncated away.
This also makes interpreting an unimplemented type as a string into
a fatal error in debug builds. Thus, we will catch problems when we
try to use those types in new I_S tables.
2007-03-27 11:30:53 -04:00
kaa@polly.local
729a405908
Fix for bug #26844 "Memory allocation failures ignored by slave IO thread".
...
Pass ME_NOREFRESH flag to an error handler in my_malloc() and _mymalloc() in case of memory allocation failure, so that it gets logged to the error log.
2007-03-26 13:31:23 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d0ed1216e2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b25301/b25301.5.0
2007-03-26 13:43:20 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
47b07aaa9f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b25301/b25301.5.1
2007-03-26 13:40:20 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
6baa89d054
after-merge fix: result adjusted.
2007-03-26 13:20:34 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
f5a24e5870
Merge mysql.com:/home/ram/work/b25993/b25993.5.0
...
into mysql.com:/home/ram/work/b25993/b25993.5.1
2007-03-26 13:01:46 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
74b3cdb02e
Fix for bug #25993 : mysqldump crashes with merge table and -c option
...
opt_complete_insert was improperly used by accident.
Use complete_insert flag instead.
2007-03-26 12:56:41 +05:00
tsmith@siva.hindu.god
3a058b0a93
Bug #24588 : "MBROverlaps missing in 5.1?"
...
The MBR-prefixed function aliases (e.g., MBROVERLAPS()) were missing in 5.1, after
some code refactoring left them out. This simply adds them into the func_array list.
2007-03-23 18:02:37 -06:00
tsmith@siva.hindu.god
bd5012a8ca
Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50
...
into siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/51
2007-03-23 17:48:03 -06:00
dkatz/Damien@damiendev.
6a7ef1849a
bug#26346
...
Fix to a memory leak found by a complier warning.
2007-03-23 19:30:25 -04:00
tsmith@siva.hindu.god
47cce188b3
Bug #24563 : MBROverlaps does not seem to function propertly.
...
Fix is to rewrite the MBR::overlaps() function, to compute the dimension of both
arguments, and the dimension of the intersection; test that all three dimensions are the
same (e.g., all are Polygons).
Add tests for all MBR* functions for various combinations of shapes, lines and points.
2007-03-23 16:28:07 -06:00
dkatz/Damien@damiendev.
8cb8bf0ed0
Merge damiendev.:C:/build/dev50
...
into damiendev.:C:/build/mysql-5.1
2007-03-23 18:22:57 -04:00
dkatz/Damien@damiendev.
53ecf4207e
bug#26346
...
Added some fixes for an existing memory leak and unitilialized variables, both caught by gcc.
2007-03-23 18:15:11 -04:00
dkatz/Damien@damiendev.
772a76a78d
Merge damiendev.:C:/build/dev50
...
into damiendev.:C:/build/mysql-5.1
2007-03-23 13:47:50 -04:00
dkatz/Damien@damiendev.
b712e2fe28
Merge damiendev.:C:/build/mysql-5.0
...
into damiendev.:C:/build/dev50
2007-03-23 13:43:46 -04:00
dkatz/Damien@damiendev.
7e063af361
Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into damiendev.:C:/build/mysql-5.1
2007-03-23 13:33:07 -04:00
msvensson@pilot.blaudden
f4ab12e859
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-23 17:15:44 +01:00
msvensson@pilot.blaudden
d8ab3024a4
Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 16:44:33 +01:00
msvensson@pilot.blaudden
a1e7778642
Import patch from yaSSL after fixing warnings upstream
2007-03-23 16:41:17 +01:00
msvensson@pilot.blaudden
85aa1bec89
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-23 13:43:09 +01:00
msvensson@pilot.blaudden
c06e2804d3
Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 13:40:57 +01:00