Commit 7e028f99 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/my/mysql-4.1


sql/field.cc:
  Auto merged
parents 14707d71 cb8d9c3a

client/mysql.cc

+2 −2
Original line number Diff line number Diff line
@@ -2914,9 +2914,9 @@ com_status(String *buffer __attribute__((unused)), 
    MYSQL_ROW cur=mysql_fetch_row(result);

    if (cur)

    {

      tee_fprintf(stdout, "Server characterset:\t%s\n", cur[0] ? cur[2] : "");

      tee_fprintf(stdout, "Server characterset:\t%s\n", cur[2] ? cur[2] : "");

      tee_fprintf(stdout, "Db     characterset:\t%s\n", cur[3] ? cur[3] : "");

      tee_fprintf(stdout, "Client characterset:\t%s\n", cur[2] ? cur[0] : "");

      tee_fprintf(stdout, "Client characterset:\t%s\n", cur[0] ? cur[0] : "");

      tee_fprintf(stdout, "Conn.  characterset:\t%s\n", cur[1] ? cur[1] : "");

    }

    mysql_free_result(result);

include/m_string.h

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ extern char *strstr(const char *, const char *); 
extern int is_prefix(const char *, const char *);



/* Conversion routines */

double my_strtod(const char *str, char **end);

double my_strtod(const char *str, char **end, int *error);

double my_atof(const char *nptr);



extern char *llstr(longlong value,char *buff);

mysql-test/mysql-test-run.sh

+2 −1
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ while test $# -gt 0; do 
       --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqldump.trace"

      EXTRA_MYSQLBINLOG_OPT="$EXTRA_MYSQLBINLOG_OPT \

       --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqlbinlog.trace"

      EXTRA_MYSQL_CLIENT_TEST_OPT="--debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysql_client_test.trace"

      ;;

    --fast)

      FAST_START=1
@@ -681,7 +682,7 @@ then 
  EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --user=root"

fi



MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST --no-defaults --testcase --user=root --socket=$MASTER_MYSOCK --port=$MYSQL_TCP_PORT --silent"

MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST --no-defaults --testcase --user=root --socket=$MASTER_MYSOCK --port=$MYSQL_TCP_PORT --silent $EXTRA_MYSQL_CLIENT_TEST_OPT"

MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"

MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYSQLBINLOG_OPT"

MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"

mysql-test/r/ps_1general.result

+1 −0
Original line number Diff line number Diff line 
drop table if exists t5, t6, t7, t8;

drop database if exists mysqltest ;

drop database if exists client_test_db;

test_sequence

------ basic tests ------

drop table if exists t1, t9 ;

mysql-test/r/type_float.result

+33 −1
Original line number Diff line number Diff line 
drop table if exists t1;

drop table if exists t1,t2;

SELECT 10,10.0,10.,.1e+2,100.0e-1;

10	10.0	10.	.1e+2	100.0e-1

10	10.0	10	10	10
@@ -8,6 +8,15 @@ SELECT 6e-05, -6e-05, --6e-05, -6e-05+1.000000; 
SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1;

1e1	1.e1	1.0e1	1e+1	1.e+1	1.0e+1	1e-1	1.e-1	1.0e-1

10	10	10	10	10	10	0.1	0.1	0.1

SELECT 0.001e+1,0.001e-1, -0.001e+01,-0.001e-01;

0.001e+1	0.001e-1	-0.001e+01	-0.001e-01

0.01	0.0001	-0.01	-0.0001

SELECT 123.23E+02,-123.23E-02,"123.23E+02"+0.0,"-123.23E-02"+0.0;

123.23E+02	-123.23E-02	"123.23E+02"+0.0	"-123.23E-02"+0.0

12323	-1.2323	12323	-1.2323

SELECT 2147483647E+02,21474836.47E+06;

2147483647E+02	21474836.47E+06

214748364700	21474836470000

create table t1 (f1 float(24),f2 float(52));

show full columns from t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
@@ -139,6 +148,9 @@ create table t1 (c20 char); 
insert into t1 values (5000.0);

Warnings:

Warning	1265	Data truncated for column 'c20' at row 1

insert into t1 values (0.5e4);

Warnings:

Warning	1265	Data truncated for column 'c20' at row 1

drop table t1;

create table t1 (f float(54));

ERROR 42000: Incorrect column specifier for column 'f'
@@ -203,3 +215,23 @@ c 
0.0002

2e-05

drop table t1;

CREATE TABLE t1 (

reckey int unsigned NOT NULL,

recdesc varchar(50) NOT NULL,

PRIMARY KEY  (reckey)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

INSERT INTO t1 VALUES (108, 'Has 108 as key');

INSERT INTO t1 VALUES (109, 'Has 109 as key');

select * from t1 where reckey=108;

reckey	recdesc

108	Has 108 as key

select * from t1 where reckey=1.08E2;

reckey	recdesc

108	Has 108 as key

select * from t1 where reckey=109;

reckey	recdesc

109	Has 109 as key

select * from t1 where reckey=1.09E2;

reckey	recdesc

109	Has 109 as key

drop table t1;