7946e8c3c8
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-26 20:11:13 +02:00
74a29e5db4
Bug#20894 Reproducible MySQL client segmentation fault
...
- Add two null bytes in "buff" variable allowing us to call
get_arg two times also for strings longer than sizeof(buff)
2006-10-26 19:51:29 +02:00
6a870d4cfc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
2006-10-09 18:54:48 -04:00
681acdf055
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583
2006-10-09 18:51:02 -04:00
4d0023edf6
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
2006-10-09 18:46:28 -04:00
4812d81eab
Bug#17583: mysql drops connection when stdout is not writable
...
When the client program had its stdout file descriptor closed by the calling
shell, after some amount of work (enough to fill a socket buffer) the server
would complain about a packet error and then disconnect the client.
This is a serious security problem. If stdout is closed before the mysql is
exec()d, then the first socket() call allocates file number 1 to communicate
with the server. Subsequent write()s to that file number (as when printing
results that come back from the database) go back to the server instead in
the command channel. So, one should be able to craft data which, upon being
selected back from the server to the client, and injected into the command
stream become valid MySQL protocol to do something nasty when sent /back/ to
the server.
The solution is to close explicitly the file descriptor that we *printf() to,
so that the libc layer and the OS layer both agree that the file is closed.
2006-10-09 18:28:06 -04:00
237779218c
Merge bk-internal:/home/bk/mysql-5.1-new-rpl
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-03 15:56:56 +02:00
3f8edc3706
Merge bk-internal:/home/bk/mysql-5.0-rpl
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-03 14:24:43 +02:00
3cfbe36adc
After merge fix
2006-10-03 16:00:09 +05:00
b57051381a
Fix for Bug #21412 (client allows DELIMITER with backslash character)
2006-10-02 11:45:48 -04:00
5ceadf8987
Merge siva.hindu.god:/usr/home/tim/m/bk/wl3516/50
...
into siva.hindu.god:/usr/home/tim/m/bk/wl3516/51
2006-09-29 14:12:57 -06:00
b7d0ec2422
WL #3516 : MySQL Enterprise: implement Version Display Specification
...
Print version_comment after server version in:
mysql.cc: Welcome message and 'status' command output
log.cc: Top of log files
2006-09-29 12:52:48 -06:00
8b0f82b9b8
Bug#21263 mysql client XML output does not distinguish between NULL and string 'NULL'
...
Fix: "mysql --xml" now print NULL values the same way that "mysqldump --xml" does:
<field name="name" xsi:nil="true" />
to distinguish from empty strings:
<field name="name"></field>
and from string "NULL":
<field name="name">NULL</field>
2006-09-29 16:29:39 +05:00
6042eebda6
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 07:35:04 -04:00
ca7ade8825
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-28 07:30:24 -04:00
7f410eed5e
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug21142/my41-bug21142
2006-09-18 09:06:05 +05:00
4cb1fdfb35
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my51-bug21618
2006-09-14 09:56:06 -04:00
ebf4d199df
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-14 09:21:09 -04:00
94382c313a
Bug #21618 : NULL shown as empty string in client
...
The column's NOT NULL flag doesn't affect what we should print. Remove the
wrong logic that does check it.
Also, verify that this and the previous two tests print the same data as
other output formats.
2006-09-13 11:41:41 -04:00
d58cd1de27
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-05 17:03:58 -04:00
e2f40aa6d0
Merge maint2.mysql.com:/data/localhome/tsmith/bk/41
...
into maint2.mysql.com:/data/localhome/tsmith/bk/50
2006-09-01 08:53:56 +02:00
f25b8f20d2
Fix for bug #21142 : Malformed insert causes a segmentation fault.
...
- possible stack overflow fixed.
2006-08-29 14:38:02 +05:00
d847e46c1a
Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
2006-08-28 19:35:25 +02:00
7216b5bc7a
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/arch-5.1
2006-08-25 14:07:30 -07:00
a21ec5dbd4
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_11972
2006-08-24 15:03:33 -04:00
8bc745456f
Bug #11972 : client uses wrong character set after reconnect.
...
The mysql client uses the default character set on reconnect. The default character set is now controled by the client charset command while the client is running. The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.
2006-08-24 11:15:08 -04:00
d41188130a
This is a cleanup of warnings that windows is complaining about.
2006-08-23 15:12:42 -07:00
f2f90320de
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-21 12:59:46 -04:00
9335cba3e4
17926 duplicates Bug#1989 in bug db
...
on up-merging 17926 from 5.0 tree it collides with near-identical fix 1989
in 5.1 tree. backing 17926 out of 5.1 tree.
2006-08-18 19:29:54 +02:00
c821fa8bc6
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-17 12:17:52 -04:00
d65095b451
Merge bk-internal.mysql.com:/data0/bk/tmp_reg
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1
2006-08-17 17:19:41 +02:00
6998c5140b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:53:12 -04:00
638300fa9e
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b17939
2006-08-15 14:41:29 +05:00
8deb5beb9c
Merge zim.(none):/home/brian/mysql/dep-5.0
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-08-14 15:24:29 -07:00
04c97488f9
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
6b399a498b
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-10 19:24:46 +02:00
543fcde9b9
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
2006-08-09 22:23:41 -04:00
cbe81c301a
Bug#17926: mysql.exe crashes when ctrl-c is pressed in windows
...
SIGINT is handled in funny ways on windows, which could lead to problems when
Control-C was pressed in the client during a long-running query. Now Control-C
during a query aborts that query (by sending KILL to the server on a second
connexion), while Control-C outside of a running query terminates the client.
2006-08-10 03:46:46 +02:00
86d74dc6dc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-04 19:19:26 +02:00
22c77e87a2
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-03 16:54:06 +02:00
7280f63100
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-03 09:32:58 +02:00
d4f92cbb5c
Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-08-01 20:52:21 +04:00
7b5e4ed026
Bug #20103 : Escaping with backslash does not work
...
- make the client to respect the server-side
no_backslash_escapes option and disable the
special meaning of backslash also at client side.
2006-08-01 11:05:54 +03:00
940db2e976
Merge anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-4.1-maint
...
into anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-19364
2006-07-31 12:53:47 -07:00
2461e48698
Bug#21042 mysql client segfaults on importing a mysqldump export
...
- Use strmake, that will both protect the buffer and make sure it's terminated by a zero
- Add test case
2006-07-31 14:22:32 +02:00
f7e19b40f3
Merge rama.(none):/home/jimw/my/tmp_merge
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-07-28 15:51:48 -07:00
b3bbb3789e
Bug#21042 mysql client segfaults on importing a mysqldump export
...
- Use strxnmov to protect the "buff" variable from overrun
2006-07-27 12:28:49 +02:00
fe7c252078
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-07-24 16:25:20 +02:00
162e0e0db1
Remove strange comment
2006-07-23 22:13:12 +02:00
2835ebdf63
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_bug20328
2006-07-19 17:00:39 -04:00
