Commit f3181987 authored by unknown's avatar unknown
Browse files

Merge marko@build.mysql.com:/home/bk/mysql-4.0 

into hundin.mysql.fi:/home/marko/k/mysql-4.0
parents 9ad42c70 c36356b6

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ bar@mysql.com 
bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk

brian@brian-akers-computer.local

carsten@tsort.bitbybit.dk

davida@isil.mysql.com

dlenev@brandersnatch.localdomain

client/mysql.cc

+1 −0
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      while (*argument) *argument++= 'x';		// Destroy argument

      if (*start)

	start[1]=0 ;

      tty_password= 0;

    }

    else

      tty_password= 1;

client/mysqladmin.c

+18 −3
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 


int main(int argc,char *argv[])

{

  int error, ho_error;

  int error= 0, ho_error;

  MYSQL mysql;

  char **commands, **save_argv;
@@ -285,10 +285,25 @@ int main(int argc,char *argv[]) 
		  opt_ssl_capath, opt_ssl_cipher);

#endif

  if (sql_connect(&mysql, option_wait))

  {

    unsigned int err= mysql_errno(&mysql);

    if (err >= CR_MIN_ERROR && err <= CR_MAX_ERROR)

      error= 1;

    else

    {

    error = 0;

      /* Return 0 if all commands are PING */

      for (; argc > 0; argv++, argc--)

      {

        if (find_type(argv[0], &command_typelib, 2) != ADMIN_PING)

        {

          error= 1;

          break;

        }

      }

    }

  }

  else

  {

    while (!interrupted && (!opt_count_iterations || nr_iterations))

    {

      new_line = 0;

mysql-test/r/ctype_latin1_de.result

+15 −0
Original line number Diff line number Diff line
@@ -267,3 +267,18 @@ select * from t1 where word like CAST(0xDF as CHAR); 
word	word2

	

drop table t1;

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (

autor varchar(80) NOT NULL default '',

PRIMARY KEY  (autor)

);

INSERT INTO t1 VALUES ('Powell, B.'),('Powell, Bud.'),('Powell, L. H.'),('Power, H.'),

('Poynter, M. A. L. Lane'),('Poynting, J. H. und J. J. Thomson.'),('Pozzi, S(amuel-Jean).'),

('Pozzi, Samuel-Jean.'),('Pozzo, A.'),('Pozzoli, Serge.');

SELECT * FROM t1 WHERE autor LIKE 'Poz%' ORDER BY autor;

autor

Pozzi, S(amuel-Jean).

Pozzi, Samuel-Jean.

Pozzo, A.

Pozzoli, Serge.

DROP TABLE t1;

mysql-test/t/ctype_latin1_de.test

+14 −0
Original line number Diff line number Diff line
@@ -72,3 +72,17 @@ select * from t1 where word like 'AE'; 
select * from t1 where word like 0xDF;

select * from t1 where word like CAST(0xDF as CHAR);

drop table t1;



#

# Bug #5447 Select does not find records

#

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (

  autor varchar(80) NOT NULL default '',

  PRIMARY KEY  (autor)

);

INSERT INTO t1 VALUES ('Powell, B.'),('Powell, Bud.'),('Powell, L. H.'),('Power, H.'),

('Poynter, M. A. L. Lane'),('Poynting, J. H. und J. J. Thomson.'),('Pozzi, S(amuel-Jean).'),

('Pozzi, Samuel-Jean.'),('Pozzo, A.'),('Pozzoli, Serge.');

SELECT * FROM t1 WHERE autor LIKE 'Poz%' ORDER BY autor;

DROP TABLE t1;