Commit graph

2225 commits

Author SHA1 Message Date
sven@riska.(none)
ad316c259e Replace windows path separator backslash by unix path separator forward
slash in filenames also for Create_file_log_event.
2008-02-06 20:55:12 +01:00
tsmith@ramayana.hindu.god
6726c9e32d Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-05 16:04:07 -07:00
cbell/Chuck@mysql_cab_desk.
7db07f95fb BUG#32205 : Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
This patch adds code to convert the path for LOAD DATA INFILE 
events to a Unix path which is needed for running mysql client
on Windows.
2008-02-01 13:11:03 -05:00
cmiller@zippy.cornsilk.net
806ff0187d Bug#24624: MySQL client ignores its own completion table
Nothing was in the command-line dictionary, because of the wrong 
order of instructions when populating it.

This is a smaller, less optimistic patch that both fixes a bug and
refreshes the list of keywords that the command-line library (e.g., 
readline) can use to expand typed commands.  Now, read from the 
command list /after/ we free the list, not before.

The best way is to read the keywords from the lexer code, but that
doesn't work everywhere yet.  Grr.
2008-01-30 16:51:39 -05:00
cmiller@zippy.cornsilk.net
3e23741bc6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-01-29 18:23:40 -05:00
cmiller@zippy.cornsilk.net
b040a97c2a Bug#33841: mysql client crashes when returning results for long-\
running queries

Bug#33976: buffer overflow of variable time_buff in function com_go()

An internal buffer was too short.  Overextending could smash the 
stack on some architectures and cause SEGVs.  This is not a problem
that could be exploited to run arbitrary code.

To fix, I expanded one buffer to cover all the size that could be
written to (we know the abolute max).
2008-01-25 10:53:21 -05:00
tsmith@ramayana.hindu.god
ff4835385a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2008-01-23 11:48:29 -07:00
cmiller@zippy.cornsilk.net
71316696a1 Patch contributed by Jocelyn Fournier. CLA received 2007-02-27.
Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed

mysqlcheck tests nullness of the engine type to know whether the
"table" is a view or not.  That also falsely catches tables that 
are severly damaged.

Instead, use SHOW FULL TABLES to test whether a "table" is a view
or not.

(Don't add new function.  Instead, get original data a smarter way.)

Make it safe for use against databases before when views appeared.
2008-01-23 11:37:46 -05:00
kaa@kaamos.(none)
f8ade5e91b Merge kaamos.(none):/data/src/mysql-5.0
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-01-10 20:43:05 +03:00
df@pippilotta.erinye.com
f7527b7856 BUG#33057 mysql command line client slows down and uses 100% CPU when restoring dump 2007-12-20 21:37:21 +01:00
tnurnberg@white.intern.koehntopp.de
977a189e24 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 14:17:18 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b89fabe164 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  mysql.com:/misc/mysql/31752_/41-31752_
2007-12-17 14:06:15 +01:00
tnurnberg@white.intern.koehntopp.de
5016d16507 Merge mysql.com:/misc/mysql/31752_/41-31752_
into  mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 12:10:26 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
93894a444e Bug#31752: check strmake() bounds
fix test program
2007-12-17 12:09:21 +01:00
tnurnberg@white.intern.koehntopp.de
f7aa719268 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 09:45:36 +01:00
gluh@eagle.(none)
e039595029 Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-12-13 14:52:49 +04:00
tsmith@ramayana.hindu.god
10cab933b2 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-04 20:58:21 -07:00
tnurnberg@white.intern.koehntopp.de
55d6d04df0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/misc/mysql/31177/50-31177
2007-12-02 01:48:43 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
31d4e58ad4 Bug#31177: Server variables can't be set to their current values
Default values of variables were not subject to upper/lower bounds
and step, while setting variables was. Bounds and step are also
applied to defaults now; defaults are corrected quietly, values
given by the user are corrected, and a correction-warning is thrown
as needed. Lastly, very large values could wrap around, starting
from 0 again. They are bounded at the maximum value for the
respective data-type now if no lower maximum is specified in the
variable's definition.
2007-11-30 06:32:04 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
883338a949 Bug#31752: check strmake() bounds
strmake() called with wrong parameters:
5.0-specific fixes.
2007-11-26 09:13:23 +01:00
mkindahl@dl145h.mysql.com
3cf2733086 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2007-11-21 21:11:57 +01:00
guilhem@gbichot4.local
2bcf5b4e97 BUG#27850 "mysqldump --single-transaction does not work if TRUNCATE/DROP/RENAME/ALTER":
this has already been closed by a note in the manual, now we
complete this by a note in "mysqldump --help"
2007-11-20 10:25:07 +01:00
kaa@polly.(none)
ee1bb66368 Merge polly.(none):/home/kaa/src/opt/bug32376/my50-bug26215
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-11-19 16:14:05 +03:00
kaa@polly.(none)
b93bbc5ea6 Changed the help text for --comments to make it clear which option
disables the option explicitely.
Changed the option location in code so that --help will show it in
lexical option order.

This is for bug #26215: mysql command line client should not strip
comments from SQL statements
2007-11-19 15:27:44 +03:00
kaa@polly.(none)
02b913ad26 Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-11-05 14:45:55 +03:00
kaa@polly.(none)
910003b544 Fixed code that parses the DELIMITER command to correctly calculate
the length of the remaining input string.

This is to fix mysqldump test failure in PB introduced by the patch
for bug #26215.
2007-11-05 13:30:31 +03:00
kaa@polly.(none)
fa462599ca Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-11-02 17:23:12 +03:00
kaa@polly.(none)
9cd5f49c53 Fix for:
bug #26215: mysql command line client should not strip comments
              from SQL statements
and
  bug #11230: Keeping comments when storing stored procedures

With the introduction of multiline comments support in the command line
client (mysql) in MySQL 4.1, it became impossible to preserve
client-side comments within single SQL statements or stored routines.
This feature was useful for monitoring tools and maintenance.

The patch adds a new option to the command line client
('--enable-comments', '-c') which allows to preserve SQL comments and
send them to the server for single SQL statements, and to keep comments
in the code for stored procedures / functions / triggers.

The patch is a modification of the contributed patch from bug #11230
with the following changes:
- code style changes to conform to the coding guidelines
- changed is_prefix() to my_strnncoll() to detect the DELIMITER
command, since the first one is case-sensitive and not charset-aware
- renamed t/comments-51.* to t/mysql_comments.*
- removed tests for comments in triggers since 5.0 does not have SHOW
CREATE TRIGGER (those tests will be added back in 5.1).

The test cases are only for bug #11230. No automated test case for bug
#26215 is possible due to the test suite deficiencies (though the cases
from the bug report were tested manually).
2007-11-02 13:40:34 +03:00
msvensson@pilot.mysql.com
925f4dac99 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-11-01 16:55:16 +01:00
msvensson@pilot.mysql.com
53bc1d5c25 Bug#31004 mysqltest needs a --mkdir command
- Add new mysqltest command "mkdir" and "rmdir"
2007-11-01 15:42:19 +01:00
msvensson@pilot.mysql.com
ec5ee6f5e4 Fix comment 2007-11-01 11:01:05 +01:00
msvensson@pilot.mysql.com
3ef9cb4ed9 Backport mysqltests "change_user" command 2007-10-31 18:44:31 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
38b3b36754 Fix for bug #30654: mysqlcheck fails during upgrade of tables whose
names include backticks or blank

Problem: mysqlcheck doesn't escape backtick characters in the table names.

Fix: escape them.
2007-10-30 12:51:57 +04:00
bar@bar.myoffice.izhnet.ru
628b462881 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-merge
2007-10-30 12:21:44 +04:00
bar@bar.myoffice.izhnet.ru
811e64de62 Merge mysql.com:/home/bar/mysql-work/mysql-5.0
into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-mr
2007-10-24 10:49:46 +05:00
gluh@eagle.(none)
237383f0fe Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-23 18:51:43 +05:00
iggy@alf.(none)
5e98415d4a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  alf.(none):/src/bug28774/my50-bug28774
2007-10-08 22:40:30 -04:00
iggy@alf.(none)
19107288e4 Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and
doesn't clean them up
- Make sure to cleanup temporary files after use.
2007-10-08 22:30:41 -04:00
msvensson@pilot.mysql.com
53975763b8 Merge msvensson2.mysql.internal:mysql/mysql-5.0-maint
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-10-05 19:32:14 +02:00
msvensson@shellback.(none)
39a069b296 Bug#31398 problems with mysql-test-run, part2
Write .reject file to r/ if it's writable else use opt_logdir
2007-10-05 18:18:50 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
2b42750a51 Bug#29323 mysql client only accetps ANSI encoded files
Fix: ignore BOM marker in the first line.
2007-10-04 13:06:01 +05:00
tnurnberg@sin.intern.azundris.com
c8a6f30a5b Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
2007-10-04 08:42:36 +02:00
tnurnberg@sin.intern.azundris.com
fee111cd29 Merge sin.intern.azundris.com:/home/tnurnberg/30444/41-30444
into  sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
2007-10-04 08:32:43 +02:00
tnurnberg@sin.intern.azundris.com
c623e73e8f Bug #30444: 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database
The combination of --single-transaction and --master-data requires
START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
mysqld 4.1 on. When trying this against an older server, print
diagnostic, then, if --force is not given, abort.

No test-case given since it would require a mysqld < 4.1.
2007-10-04 08:27:03 +02:00
gshchepa/uchum@gleb.loc
c81751adba mysqldump.c, mysqldump.test, mysqldump.result:
Bug #31077: post-commit fix.
2007-10-03 02:50:38 +05:00
gshchepa/uchum@gleb.loc
5fc81ee88e Fixed bug #31077.
mysqldump adds the "-- Dump completed on YYYY-MM-DD hh:mm:ss" string
to the end of output if the --comments switch is on.
The only way to suppress this line is to use --skip-comments/--compact
switch.

New switch has been added to the mysqldump client command line:
--dump-date.

For the compatibility with previous releases, by default the --dump-date
is on.
The --dump-date switch forces mysqldump to add date to the
"-- Dump completed on ..." string at the end of output.
The --skip-dump-date switch supresses the output of date string
and uses short form of that commentary: "-- Dump completed".
--skip-comments or --compact switches disable the whole commentary
as usual.
2007-10-01 20:35:51 +05:00
tsmith@sita.local
5aba321046 Merge sita.local:/Users/tsmith/m/bk/50
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-09-24 11:33:27 +02:00
tnurnberg@sin.intern.azundris.com
7451aaf48c Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/tnurnberg/15327/50-15327
2007-09-15 04:45:20 +02:00
tnurnberg@mysql.com/sin.intern.azundris.com
3c6ca8d6ed Bug #15327: configure: --with-tcp-port option being partially ignored
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout. if they
didn't configure a value, assume "use a sensible default", which
will be read from /etc/services or, failing that, from the factory
default. That makes the order of preference
- command-line option
- my.cnf, where applicable
- $MYSQL_TCP_PORT environment variable
- /etc/services (unless configured --with-tcp-port)
- default port (--with-tcp-port=... or factory default)
2007-09-13 16:19:46 +02:00
gshchepa/uchum@gleb.loc
ff042427cf Merge gleb.loc:/home/uchum/work/bk/5.0
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-12 23:41:35 +05:00