kent@kent-amd64.(none)
9d247f296a
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
2007-07-21 01:53:19 +02:00
joerg@trift-lap.none
1a86cbd26f
Merge trift-lap.none:/MySQL/M50/bug14151-5.0
...
into trift-lap.none:/MySQL/M50/push-5.0
2007-07-20 13:35:23 +02:00
gshchepa/uchum@gleb.loc
c06d233d4d
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-20 04:15:50 +05:00
joerg@trift-lap.none
af3c675bc1
Avoid the name conflict between the system-provided "md5.h" and the MySQL one
...
by renaming "include/md5.h" to "include/my_md5.h".
Fixes bug#14151.
2007-07-19 14:14:03 +02:00
gshchepa/uchum@gleb.loc
3f91aedadb
Fixed bug #28524 .
...
For each view the mysqldump utility creates a temporary table
with the same name and the same columns as the view
in order to satisfy views that depend on this view.
After the creation of all tables, mysqldump drops all
temporary tables and creates actual views.
However, --skip-add-drop-table and --compact flags disable
DROP TABLE statements for those temporary tables. Thus, it was
impossible to create the views because of existence of the
temporary tables with the same names.
2007-07-18 19:14:48 +05:00
gshchepa/uchum@gleb.loc
92b65b8a4b
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-13 20:49:21 +05:00
dkatz@damien-katzs-computer.local
0a30874589
When opening a new connecgtion, changed mysqltest to prefer a brand new connection slot over an existing, closed slot. Fixes a problem with reused slots that can cause tests to fail. bug#29579
2007-07-13 01:55:04 -04:00
dkatz@damien-katzs-computer.local
a55c8bef49
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50
2007-07-12 22:19:07 -04:00
dkatz@damien-katzs-computer.local
899aaa6bb2
Bug #29579 Clients using SSL can hang the server
...
Added an option to yassl to allow "quiet shutdown" like openssl does. This option causes the SSL libs to NOT perform the close_notify handshake during shutdown. This fixes a hang we experience because we hold a lock during socket shutdown.
2007-07-12 22:06:33 -04:00
gkodinov/kgeorge@magare.gmz
7735a2f2eb
Bug #29469 : Client dies if a query is issued after hitting Ctrl + C
...
The Ctrl-C handler in mysql closes the console while ReadConsole()
waits for console input.
But the main thread was detecting that ReadConsole() haven't read
anything and was processing as if there're data in the buffer.
Fixed to handle correctly this error condition.
No test case added as the test relies on Ctrl-C sent to the client
from its console.
2007-07-10 10:43:12 +03:00
msvensson@pilot.(none)
a1a1dbc753
Bug#29361 mysqldump creates stray file when too long path name is passed
...
- Move the check of too long path to 'get_one_option'
2007-06-28 11:23:59 +02:00
df@pippilotta.erinye.com
b2b965b534
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-06-16 06:16:00 +02:00
df@pippilotta.erinye.com
973c541b5c
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-06-15 09:36:05 +02:00
georg@bing.site
7c02fbd147
Added yassl and taocrypt sources to mysqlclientlib
2007-06-15 09:18:58 +02:00
holyfoot/hf@hfmain.(none)
8ccc50b303
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-06-14 16:41:10 +05:00
df@pippilotta.erinye.com
6f8a8a56ea
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-06-11 09:53:57 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
96d07631b2
Bug #28333 Test "flush" tries to create a new thread - on only one platform
...
on PPC/Debian Linux default stack size for a thread is too big.
As we use default thread settings in mysqltest, the
thread creation fails if we create lots of threads (as it
happens in flush.test). So now stack size is explicitly specified
for the mysqltest
2007-06-09 00:39:23 +05:00
df@pippilotta.erinye.com
f1f4d22948
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-06-06 14:23:15 +02: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
df@pippilotta.erinye.com
32f4cfb8a9
BUG#28860 USE_TLS not defined for mysqlclient.lib
2007-06-04 14:12:31 +02:00
msvensson@pilot.(none)
be55062f64
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-02 09:05:37 +02:00
msvensson@pilot.(none)
9fd2b5ffaf
Move code after variable delcaration
2007-06-01 19:57:26 +02:00
msvensson@pilot.(none)
146e087186
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-01 14:53:58 +02:00
msvensson@pilot.(none)
d43153f274
Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_value
...
into pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497
2007-06-01 12:04:05 +02:00
msvensson@pilot.(none)
09c5c03cb2
Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test failures
...
- Add funtion "query_get_value to allow reading a fields value
into a $variable
2007-06-01 12:01:42 +02:00
tsmith@quadxeon.mysql.com
298e5002e3
mysqldump.c:
...
Fix harmless typo (caught thanks to warning)
2007-05-31 00:40:56 +02:00
ibabaev@bk-internal.mysql.com
040e46fc1c
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-05-28 00:05:38 +02:00
dkatz@damien-katzs-computer.local
4a7cdfc05d
Bug #24733 RESET MASTER run before dump with --delete-master-logs
...
fixed by using flush logs, dumping, then doing PURGE MASTER LOGS TO 'binfile', instead
of deleting the log files at the beginning.
NOTE: previously the delete-master-logs would reset the log names back to
filename.00001. Now the trailing number doesn't get reset. This may need to be
documented.
2007-05-27 11:50:10 -04:00
gshchepa/uchum@gleb.loc
2ee30b0b7f
Fixed bug #28522 :
...
sometimes `mysqldump --hex-blob' overruned output buffer by '\0' byte.
The dump_table() function has been fixed to reserve 1 byte more for the
last '\0' byte of dumped string.
2007-05-25 17:24:17 +05:00
msvensson@pilot.blaudden
01ae08078e
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-18 12:58:28 +02:00
msvensson@pilot.blaudden
c3f407a07a
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-18 12:56:52 +02:00
msvensson@pilot.blaudden
e05aa94353
WL#2247 mysqltest: add option for sorting results
...
- Final touchups
2007-05-18 12:50:23 +02:00
tsmith@siva.hindu.god
30bc713c77
Merge siva.hindu.god:/home/tsmith/m/bk/50
...
into siva.hindu.god:/home/tsmith/m/bk/maint/50
2007-05-17 14:17:50 -06:00
msvensson@pilot.blaudden
d5676f2feb
WL#2247 mysqltest: add option for sorting results
...
- Change from "query_sorted <query>" to "sorted_results"
2007-05-16 17:19:36 +02:00
msvensson@pilot.blaudden
4fed3bd425
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-16 16:31:05 +02:00
msvensson@pilot.blaudden
8e9149ea11
Bug#28470 mysqltest scripts need to know protocol
2007-05-16 16:30:26 +02:00
msvensson@pilot.blaudden
e888128e88
Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it
...
- mysqldump generated output that set OLD_SQL_MODE twice, to different values
(for triggers), or not at all (for routines) in some cases.
2007-05-16 10:14:29 +02:00
joerg@trift2.
bb2996f487
Format corrections for various "Makefile.am": Leading tab, no trailing blank.
2007-05-02 14:01:49 +02:00
tnurnberg@mysql.com/blasphemy.mysql.com
ce1074f6fe
Bug#27293: mysqldump crashes when dumping procedure defined by different user
...
mysqldump didn't properly handle getting no data on
SHOW CREATE PROCEDURE. If S/C/P fails (due to dumping
user's insufficient privileges on mysql.proc, say),
mysqldump will print a comment to that effect to the
output and return an error-code. If the -f (force) option
is used, the dump will continue, otherwise, it will abort
right there and then.
Also fixes Bug#22761, "mysqldump reports no errors when using
--routines without mysql.proc privileges"
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/tnurnberg/27293/50-27293
2007-04-30 11:30:07 +02:00
iggy@recycle.(none)
4a50d613df
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into recycle.(none):/src/bug24732/my50-bug24732
2007-04-23 16:36:40 -04:00
iggy@recycle.(none)
7a358c4b5c
Bug#24732 Executables do not include Vista manifests
...
- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.
2007-04-23 15:41:24 -04:00
msvensson@pilot.blaudden
dcd914e24e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-23 16:22:01 +02:00
msvensson@pilot.blaudden
7ddc33753e
Use a temp variable "error" for storing return code of pclose
...
so the WEXITSTATUS macro can "fiddle" with it as it so pleases
2007-04-23 13:27:55 +02:00
msvensson@pilot.blaudden
714c36ce27
It's not possible to use the return value of fputs
...
to check if the creation of mysql_upgrade_info suceeded.
Instead use 'upgrade_already_done' to check that file was
created properly.
2007-04-23 13:07:49 +02:00
msvensson@pilot.blaudden
d1de41c59a
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-23 12:05:00 +02:00
mats@romeo.(none)
f1caa9559c
Merge romeo.(none):/home/bkroot/mysql-5.0-rpl
...
into romeo.(none):/home/bk/merge-mysql-5.0
2007-04-20 10:35:27 +02:00
msvensson@pilot.blaudden
71e58855bf
Remove comment
2007-04-20 07:20:26 +02:00
msvensson@pilot.blaudden
da93a36a0e
mysql_upgrade portability fixes
2007-04-19 21:30:46 +02:00
msvensson@pilot.blaudden
2c95135c8d
mysql_upgrade depends on GenFixPrivs
2007-04-19 18:32:55 +02:00
msvensson@pilot.blaudden
41c41448b9
mysql_upgrade win fixes
2007-04-19 17:00:29 +02:00