Davi Arnaut
02a5dd38f3
Merge from 5.1 main.
2009-06-08 09:55:37 -03:00
Luis Soares
1d3daee450
BUG#42941: --database paramater to mysqlbinlog fails with RBR
...
mysqlbinlog --database parameter was being ignored when processing
row events. As such no event filtering would take place.
This patch addresses this by deploying a call to shall_skip_database
when table_map_events are handled (as these contain also the name of
the database). All other rows events referencing the table id for the
filtered map event, will also be skipped.
2009-06-07 23:28:08 +01:00
Tatiana A. Nurnberg
69e78274ae
manual merge
2009-06-06 18:41:40 +02:00
Davi Arnaut
82d2797d0a
Don't mix declarations and code (not widely portable).
2009-06-06 12:26:39 -03:00
Georgi Kodinov
845f968369
merged 5.0-bugteam -> 5.1-bugteam
2009-06-05 19:40:36 +03:00
Georgi Kodinov
b311cb83f2
automerge
2009-06-05 19:27:48 +03:00
Georgi Kodinov
c6fdeff0c7
Addendum to Bug #45286 : implement reviewer's remarks.
2009-06-05 19:23:44 +03:00
Georgi Kodinov
7787dee76a
Bug #43532 : backport of the 5.1 code to 5.0 mysqltest
2009-06-05 17:59:23 +03:00
Georgi Kodinov
a66fd23980
Bug #45286 : compilation warnings on mysql-5.0-bugteam on MacOSX
...
Merged the 5.0 fix to 5.1 and fixed the 5.1 specific warnings.
2009-06-05 16:44:38 +03:00
Georgi Kodinov
1a8eb91e06
automerge
2009-06-05 15:30:57 +03:00
Georgi Kodinov
5ec61b304c
Bug #45286 : compilation warnings on mysql-5.0-bugteam on MacOSX
...
Fixed the 5.0-bugteam MacOSX warnings.
2009-06-05 15:05:26 +03:00
Alexander Nozdrin
0f742616ce
Fix compilation failures: get rid of C++ specifics in C-code.
2009-06-03 15:18:12 +04:00
Tatiana A. Nurnberg
81eb33838b
auto-merge
2009-05-29 18:49:35 +02:00
Alexey Kopytov
f1fb5aa2d2
Automerge
2009-05-29 18:08:16 +04:00
Bjorn Munch
524bd596e2
merge from 5.1 main
2009-05-29 13:04:02 +02:00
Sergey Glukhov
871ea8a735
5.0-bugteam->5.1-bugteam merge
2009-05-28 13:40:09 +05:00
Sergey Glukhov
394f6ba478
Bug#37268 'binary' character set makes CLI-internal commands case sensitive
...
The fix is to use case insensitive collation
for mysql client command search.
2009-05-28 13:34:30 +05:00
Bjorn Munch
f26f8edff4
cherry picking fix for Bug #39542 from 6.0-runtime
2009-05-27 22:54:40 +02:00
Tatiana A. Nurnberg
7eeff66cba
Bug#34861: mysqldump with --tab gives weird output for triggers.
...
mysqldump --tab still dumped triggers to stdout rather than to
individual tables.
We now append triggers to the .sql file for the corresponding
table.
--events and --routines correspond to a database rather than a
table and will still go to stdout with --tab unless redirected
with --result-file (-r).
2009-05-27 15:16:21 +02:00
Alexey Kopytov
23c0cf38bf
Bug #44638 : mysql_upgrade, mysqlcheck output instance unclear
...
Dump all connection-related arguments when running mysqlcheck
from mysql_upgrade.
No test case, since the output depends on the test suite
configuration and platform.
2009-05-27 12:24:25 +04:00
Bjorn Munch
f7f400bc5e
Bug #44964 mysqltest: connection <connection><some spaces>; fails now
...
Incorrection assumption about delimiter character in connection command
2009-05-26 12:45:14 +02:00
Bjorn Munch
a3c7d96742
Bug #44922 mysqltest's query_get_value function can't work with queries containing ','
...
check_command_args() always looks for the first , (or whatever)
Extended check_command_args() to let arguments be quoted
Added test in mysqltest.test
2009-05-25 17:19:20 +02:00
Jim Winstead
f8e2402084
mysqlcheck failed to fix table names when using the --fix-table-names
...
and --all-in-1 options together. (Bug #31821 )
2009-05-20 18:31:10 -07:00
Jim Winstead
89a6be6438
mysqladmin --count=X --sleep=Y would always delay Y seconds after the last
...
iteration before exiting. (Bug #42639 )
2009-05-20 17:25:10 -07:00
Jim Winstead
66f12372c1
The mysql command-line client would include superfluous spaces at the end of
...
some result set lines. (Bug #29622 )
2009-05-20 17:04:44 -07:00
Jim Winstead
8533206280
Fix warning in use of strlen().
2009-05-20 12:58:01 -07:00
Jim Winstead
16aeb5ad3d
Table identifiers and file names were not quoted and escaped correctly by
...
mysqlimport. (Bug #28071 )
2009-05-19 15:26:57 -07:00
Jim Winstead
eb1261502c
mysql_upgrade ignored the --basedir and --datadir arguments as it has no use
...
for them, but it did so silently. (Bug #36558 )
2009-05-19 10:39:03 -07:00
Jim Winstead
00920ce29b
The mysql command-line client didn't implement the readline magic-space
...
command, which bash does, which could result in a user accidentally disabling
the use of the space key in the mysql command-line client. (Bug #27439 )
2009-05-19 10:17:05 -07:00
Jim Winstead
8b218c54d4
mysqlslap didn't correctly handle --csv with no argument. (Bug #44412 )
2009-05-18 18:23:43 -07:00
Jim Winstead
c2fcd6b26d
mysqladmin did not have enough space allocated for tracking all variables
...
when using --vertical or --relative with extended-status. (Bug #40395 )
This patch simply increases the buffer size and adds an assert to
check that it is big enough -- a more comprehensive fix would dynamically
allocate the appropriate buffers.
2009-05-18 14:19:18 -07:00
Jim Winstead
caba34a1b4
The output of mysqldump --tab for views included a DROP TABLE statement
...
without the IF EXISTS qualifier even though no temporary table is created
as for all-in-one dumps including views. (Bug #37377 )
2009-05-18 12:52:51 -07:00
Jim Winstead
b6ff695231
Add usage for --base64-output=DECODE-ROWS and note that UNSPEC is
...
intentionally unmentioned (it is just a placeholder). (Bug #41403 )
2009-05-15 13:25:22 -07:00
Jim Winstead
2c77ef3ca3
Remove out-of-date and unnecessary comment in source code about what versions
...
are supported. (Bug #42021 )
2009-05-15 13:12:20 -07:00
Jim Winstead
6cbe3ef3f9
Merge from 5.0-bugteam
2009-05-12 14:20:33 -07:00
Jim Winstead
883ddef98a
mysqlimport was not always compiled correctly to allow thread support,
...
required for the --use-threads option. (Bug #32991 )
2009-05-12 10:45:40 -07:00
Jim Winstead
e3fa685917
mysqldump would not dump the INFORMATION_SCHEMA even when it was explicitly
...
requested. (Bug #33762 )
2009-05-12 10:38:14 -07:00
Jim Winstead
2e7cdfd3e7
Merge from 5.0-bugteam
2009-05-13 08:48:00 -07:00
Jim Winstead
9a84e1e788
Merge in approved bug-fixes
2009-05-12 14:27:19 -07:00
Alexey Kopytov
65cd3204fb
Automerge.
2009-05-08 21:50:04 +04:00
Alexey Kopytov
88370b7d1e
Manual merge.
2009-05-08 21:24:15 +04:00
Jim Winstead
337a20a800
The mysql command-line client did not properly handle MYSQL_HISTFILE being set
...
to an empty string, or to /dev/null, as we suggest and have suggested in the
documentation. (Bug #34224 )
2009-05-07 17:48:20 -07:00
Jim Winstead
850f6c2225
mysqladmin kill can't handle 64-bit thread IDs. (Bug #32457 )
2009-05-07 13:09:53 -07:00
Jim Winstead
6280e26c48
Various command-line utilities, including mysqlbinlog and mysqldump, don't
...
handle the --skip-password option correctly. (Bug #28479 )
2009-05-07 10:51:55 -07:00
Jim Winstead
0ba8aa103e
Fix support for -i (--ignore-spaces) in the mysql command line application,
...
which didn't actually do anything. (Bug #39101 )
2009-05-07 10:28:29 -07:00
Alexey Kopytov
025ca02f28
Bug #41943 : mysqlbinlog.exe crashes if --hexdump option is used
...
The --hexdump option crashed mysqlbinlog when used together
with the --read-from-remote-server option due to use of
uninitialized memory.
Since Log_event::print_header() relies on temp_buf to be
initialized when the --hexdump option is present,
dump_remote_log_entries() was fixed to setup temp_buf to point
to the start of a binlog event as done in
dump_local_log_entries().
The root cause of this bug is identical to the one for
bug #17654 . The latter was fixed in 5.1 and up, so this
patch is backport of the patches for bug #17654 to 5.0.
Only 5.0 needs a changelog entry.
2009-05-07 18:31:02 +04:00
Jim Winstead
8a43356fac
Remove extraneous space in --debug-check usage info.
2009-04-28 11:30:21 -07:00
Jim Winstead
55e33e6292
Make SSL options appear in correct place in mysql_upgrade and mysqltest
...
usage information. (Bug #31883 )
2009-04-28 11:26:31 -07:00
Jim Winstead
6510c77e93
Fix list of options enabled by mysqldump --compact (Bug #32408 )
2009-04-28 11:23:21 -07:00
Jim Winstead
345040a025
Bug #27884 : mysql --html does not quote HTML special characters in output
...
Fix encoding of field values and names in HTML output from mysql client.
2009-04-28 10:54:26 -07:00