summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-02-28 21:58:32 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2002-02-28 21:58:32 +0200
commita7df512a8f744fc94023a13c42d85203509ace5a (patch)
tree18196b0e2ec2b524138d6f04264ad5f06b431da5 /libmysql
parentca2186187d4539460c183f6b9df6e118516b724b (diff)
downloadmariadb-git-a7df512a8f744fc94023a13c42d85203509ace5a.tar.gz
many fixes
libmysql/libmysql.c: Fixes a very rare bug when variable name (without '_') and it's value are at the very end of the config file. I have tested it , but would liek little mobster to test it further mysql-test/r/union.result: results for union test that proves that EXPLAIN UNION bugs are fixed mysql-test/t/union.test: additional tests for EXPLAIN on UNION's that have previously failed sql/sql_yacc.yy: Some small fixes for newer parsers. Only unsigned int yystacksize remains to be fixed. This I leave to Monty. Present fixes are only aesthetic and do not harm.
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 32aa8e59888..4e4518bbe10 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -737,7 +737,7 @@ static void mysql_read_default_options(struct st_mysql_options *options,
*end=0; /* Remove '=' */
}
/* Change all '_' in variable name to '-' */
- for (end= *option ; (end= strcend(end,'_')) ; )
+ for (end= *option ; (end= strcend(end,'_')) && *end ; )
*end= '-';
switch (find_type(*option+2,&option_types,2)) {
case 1: /* port */