Commit graph

79 commits

Author SHA1 Message Date
Georgi Kodinov
18526afc07 merged 41437 to 5.1-bugteam 2009-01-09 19:51:52 +02:00
Georgi Kodinov
7c3ae51647 Bug #41437: Value stored in 'case' lacks charset, causes segfault
When substituting system constant functions with a constant result
the server was not expecting that the function may return NULL.
Fixed by checking for NULL and returning Item_null (in the relevant
collation) if the result of the system constant function was NULL.
2009-01-09 13:50:18 +02:00
Chad MILLER
14f2ce6dbd Merge fix for Bug 33812 from 5.0-bugteam. 2008-12-11 12:46:20 -05:00
Chad MILLER
cf9126a034 Bug#33812: mysql client incorrectly parsing DELIMITER
Fix parsing of mysql client commands, especially in relation to
single-line comments when --comments was specified.

This is a little tricky, because we need to allow single-line
comments in the middle of statements, but we don't want to allow
client commands in the middle of statements. So in
comment-preservation mode, we go ahead and send single-line
comments to the server immediately when we encounter them on their
own. 

This is still slightly flawed, in that it does not handle a
single-line comment with leading spaces, followed by a client-side
command when --comment has been enabled. But this isn't a new
problem, and it is quite an edge condition. Fixing it would require
a more extensive overall of how the mysql client parses commands.
2008-12-11 12:26:03 -05:00
msvensson@pilot.mysql.com
f45cf3e975 Bug#25146 Some warnings/errors not shown when using --show-warnings
- Additional patch to fix compiler warnings
2007-11-26 19:50:43 +01:00
mkindahl@dl145h.mysql.com
0c7f3bdeba Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2007-11-21 21:15:33 +01:00
tsmith@ramayana.hindu.god
6a193c5528 Bug #25146: Some warnings/errors not shown when using --show-warnings
In several cases, an error when processing the query would cause mysql to
return to the top level without printing warnings.  Fix is to always
print any available warnings before returning to the top level.
2007-11-20 17:03:56 -07:00
aelkin/elkin@koti.dsl.inet.fi
4c6e14ce8d Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/5.1-merge
2007-10-04 12:27:14 +03: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
malff/marcsql@weblab.(none)
3a7bcd72f3 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-09-04 14:38:26 -06:00
malff/marcsql@weblab.(none)
0f58ed7e74 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
2007-09-04 12:25:54 -06:00
kaa@polly.(none)
4c2a63ea54 Merge polly.(none):/home/kaa/src/bug30164/my50-bug30164
into  polly.(none):/home/kaa/src/bug30164/my51-bug30164
2007-08-30 17:23:39 +04:00
kaa@polly.(none)
33d10a0667 Use double quotes instead of single ones which make the test fail on Windows. This is for bug #30164. 2007-08-30 17:21:43 +04:00
kaa@polly.(none)
e79902aa5c Merge polly.(none):/home/kaa/src/bug30164/my50-bug30164
into  polly.(none):/home/kaa/src/bug30164/my51-bug30164
2007-08-30 12:55:29 +04:00
kaa@polly.(none)
2bb849644b Bug #30164: Using client side macro inside server side comments generates broken queries
Problem:
  
In cases when a client-side macro appears inside a server-side comment, the add_line() function in mysql.cc discarded all characters until the next delimiter to remove macro arguments from the query string. This resulted in broken queries being sent to the server when the next delimiter character appeared past the comment's boundaries, because the comment closing sequence ('*/') was discarded.
  
Fix:
  
If a client-side macro appears inside a server-side comment, discard all characters in the comment after the macro (that is, until the end of the comment rather than the next delimiter).
This is a minimal fix to allow only simple cases used by the mysqlbinlog utility. Limitations that are worth documenting:
  
- Nested server-side and/or client-side comments are not supported by mysql.cc
- Using client-side macros in multi-line server-side comments is not supported
- All characters after a client-side macro in a server-side comment will be omitted from the query string (and thus, will not be sent to server).
2007-08-30 12:53:24 +04:00
msvensson@pilot.(none)
66b74f6a33 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-07 11:42:14 +02:00
msvensson@pilot.(none)
f785bf00de Bug#20037 mysqltest requires cygwin on windows(part 1, new mysqltest commands)
- Update comments
 - Make "write_file" fail if file already exist
 - Remove temporary files created by test cases
2007-08-07 11:40:03 +02:00
iggy@amd64.(none)
171f402ad4 Bug#29903 The CMake build method does not produce the embedded library.
- GCov fix.
2007-08-03 21:08:48 -04:00
kostja@bodhi.(none)
f1336a5809 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-06-01 17:50:24 +04:00
kostja@bodhi.(none)
d97db648a0 Fix some mysqltest warnings. 2007-06-01 17:49:01 +04:00
msvensson@pilot.blaudden
b941ef8633 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-23 13:28:09 +02:00
msvensson@pilot.blaudden
b11a1c8fd4 Update test to work also when --pager does not exist in "mysql" 2007-04-23 12:58:35 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
3a0042c757 Merge mysql.com:/home/ram/work/b26851/b26851.5.0
into  mysql.com:/home/ram/work/b26851/b26851.5.1
2007-04-19 11:07:19 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e62dbcf746 Fix for
bug #27715: mysqld --character-sets-dir buffer overflow
bug ##26851: Mysql Client --pager Buffer Overflow

Using strmov() to copy an argument may cause overflow 
if the argument's length is bigger than the buffer:
use strmake instead.
Also, we have to encrease the error message buffer size to fit 
the longest message.
2007-04-16 12:28:02 +05:00
msvensson@pilot.blaudden
f5778fc73e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 18:12:56 +01:00
msvensson@pilot.blaudden
9650b6b45e Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-23 17:36:50 +01:00
kaa@polly.local
05750812d6 Moved the test requiring cp932 to a separate unit.
This is for bug #18743.
2007-02-21 19:50:48 +03:00
kaa@polly.local
b7e6df7cc9 Merge polly.local:/tmp/maint/bug25137/my50-bug25137
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-02-20 22:23:51 +03:00
msvensson@pilot.blaudden
c282716844 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-20 18:22:50 +01:00
msvensson@pilot.blaudden
0d1d91e829 Replace "exec diff" with diff_files 2007-02-20 18:22:33 +01:00
msvensson@pilot.blaudden
cab074cb22 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-20 13:06:25 +01:00
msvensson@pilot.blaudden
a799f2b637 Change "exec echo" commands with different delimiters that are also
escape chars to use "write_file" to avoid confusion about what's what.
2007-02-20 13:06:01 +01:00
kaa@polly.local
315819fed0 Bug#18743: Several test cases fails if "classic" configuration in 5.0
The problem happened because those tests were using "cp932" and "ucs2" without checking whether these character sets are available. This fix moves test parts to make character set specific parts be tested only if they are:
- some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
- some parts were moved to the newly added tests "innodb-ucs2.test", "mysqlbinglog-cp932.test" and "sp-ucs2.test"
2007-02-19 13:57:06 +03:00
msvensson@pilot.blaudden
7970e9534b Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-16 16:13:56 +01:00
msvensson@pilot.blaudden
ee38195c90 Use " instead of ' to avoid win problem with ' 2007-02-16 16:08:08 +01:00
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02:00
monty@mysql.com/narttu.mysql.fi
a04157fbb3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2007-01-22 14:04:40 +02:00
tsmith@siva.hindu.god
94f7990ef8 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:41:52 -07:00
msvensson@neptunus.(none)
c4a86761b0 Replace the --exec in a while loop that causes 3400 executions of cygwin/bash on
windows with a small perl script that does exactly the same.
2007-01-17 13:43:03 +01:00
monty@mysql.com/narttu.mysql.fi
a6481aa4c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-12-15 01:01:52 +02:00
monty@mysql.com/narttu.mysql.fi
88dd873de0 Fixed compiler warnings detected by option -Wshadow and -Wunused:
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments

Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c

I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
2006-12-15 00:51:37 +02:00
msvensson@neptunus.(none)
b5603af7d5 Merge 192.168.0.5:mysql/mysql-5.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-29 23:53:07 +01:00
cmiller@zippy.cornsilk.net
d577e3d4a8 Fix merges. 2006-11-29 12:49:21 -05:00
msvensson@shellback.(none)
7ddc43e305 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-29 15:44:09 +01:00
msvensson@neptunus.(none)
ef582b9fa6 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 22:35:00 +01:00
msvensson@neptunus.(none)
04d5a42bbf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 20:59:57 +01:00
cmiller@zippy.cornsilk.net
45ea756c5f Revert charset breakage. 2006-11-28 13:08:41 -05:00
jpipes@shakedown.(none)
03a5dcd7ce Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
2006-11-27 14:58:57 -05:00
jpipes@shakedown.(none)
7c7b1ede76 Merge shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
into  shakedown.(none):/home/jpipes/dev/mysql-5.1-new-maint2
2006-11-27 14:46:48 -05:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/mysql-5.0-0mrg
2006-11-17 10:30:16 +04:00