Commit 6ead8600 authored by unknown's avatar unknown
Browse files

After merge fixes 

Fix for BIT(X) field as string


mysql-test/r/func_gconcat.result:
  Fix wrong merge
mysql-test/r/func_sapdb.result:
  Use results so that dimitry can fix them properly
mysql-test/r/innodb.result:
  Update test after fast TRUNCATE in InnoDB
mysql-test/r/ps_1general.result:
  After megre fixes
mysql-test/r/type_bit.result:
  New test to verify patch for Bit fields
mysql-test/t/ps_1general.test:
  After merge fixes
mysql-test/t/type_bit.test:
  New test to verify patch for Bit fields
sql/field.cc:
  Fix for new my_strntod()
  Fix for BIT(X) field as string
sql/item.h:
  Fix for new my_strntod()
sql/item_func.h:
  Fix for new my_strntod()
sql/item_sum.h:
  Fix for new my_strntod()
sql/procedure.h:
  Fix for new my_strntod()
sql/sql_base.cc:
  Port fix for INSERT DELAYED with prepared statements to 5.0
parent 2f246d2f

mysql-test/r/func_gconcat.result

+5 −5
Original line number Diff line number Diff line
@@ -457,6 +457,11 @@ group_concat(distinct b order by b) 
Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

drop table t1;

CREATE TABLE t1 (id int);

SELECT GROUP_CONCAT(id) AS gc FROM t1 HAVING gc IS NULL;

gc

NULL

DROP TABLE t1;

create table t1 (a char(3), b char(20), primary key (a, b));

insert into t1 values ('ABW', 'Dutch'), ('ABW', 'English');

select group_concat(a) from t1 group by b;
@@ -464,8 +469,3 @@ group_concat(a) 
ABW

ABW

drop table t1;
 
CREATE TABLE t1 (id int);

SELECT GROUP_CONCAT(id) AS gc FROM t1 HAVING gc IS NULL;

gc

NULL

DROP TABLE t1;

mysql-test/r/func_sapdb.result

+3 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ timediff("1997-12-31 23:59:59.000001","1997-12-30 01:01:01.000002") 
46:58:57.999999

select timediff("1997-12-30 23:59:59.000001","1997-12-31 23:59:59.000002");

timediff("1997-12-30 23:59:59.000001","1997-12-31 23:59:59.000002")

-24:00:00.000001

-23:59:59.999999

select timediff("1997-12-31 23:59:59.000001","23:59:59.000001");

timediff("1997-12-31 23:59:59.000001","23:59:59.000001")

NULL
@@ -116,7 +116,7 @@ timediff("2000:01:01 00:00:00", "2000:01:01 00:00:00.000001") 
-00:00:00.000001

select timediff("2005-01-11 15:48:49.999999", "2005-01-11 15:48:50");

timediff("2005-01-11 15:48:49.999999", "2005-01-11 15:48:50")

-00:00:00.000001

-00:00:01.999999

select maketime(10,11,12);

maketime(10,11,12)

10:11:12
@@ -188,7 +188,7 @@ f8 date YES NULL 
f9	time	YES		NULL	

select * from t1;

f1	f2	f3	f4	f5	f6	f7	f8	f9

1997-01-01	1998-01-02 01:01:00	49:01:01	46:58:57	-24:00:00	10:11:12	2001-12-01 01:01:01	1997-12-31	23:59:59

1997-01-01	1998-01-02 01:01:00	49:01:01	46:58:57	-23:59:59	10:11:12	2001-12-01 01:01:01	1997-12-31	23:59:59

create table test(t1 datetime, t2 time, t3 time, t4 datetime);

insert into test values 

('2001-01-01 01:01:01', '01:01:01', null, '2001-02-01 01:01:01'),

mysql-test/r/innodb.result

+4 −4
Original line number Diff line number Diff line
@@ -1326,8 +1326,8 @@ truncate table t1; 
insert into t1 (a) values (NULL),(NULL);

SELECT * from t1;

a

3

4

1

2

drop table t1;

CREATE TABLE t1 (`id 1` INT NOT NULL, PRIMARY KEY (`id 1`)) ENGINE=INNODB;

CREATE TABLE t2 (id INT PRIMARY KEY, t1_id INT, INDEX par_ind (t1_id), FOREIGN KEY (`t1_id`) REFERENCES `t1`(`id 1`)  ON DELETE CASCADE ) ENGINE=INNODB;
@@ -1690,13 +1690,13 @@ Variable_name Value 
Innodb_page_size	16384

show status like "Innodb_rows_deleted";

Variable_name	Value

Innodb_rows_deleted	2078

Innodb_rows_deleted	2070

show status like "Innodb_rows_inserted";

Variable_name	Value

Innodb_rows_inserted	31706

show status like "Innodb_rows_read";

Variable_name	Value

Innodb_rows_read	80161

Innodb_rows_read	80153

show status like "Innodb_rows_updated";

Variable_name	Value

Innodb_rows_updated	29530

mysql-test/r/ps_1general.result

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ execute stmt4; 
prepare stmt4 from ' show full processlist ';

execute stmt4;

Id	User	Host	db	Command	Time	State	Info

number	root	localhost	test	Query	time	NULL	show full processlist

prepare stmt4 from ' show grants for user ';

prepare stmt4 from ' show create table t2 ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

mysql-test/r/type_bit.result

+11 −0
Original line number Diff line number Diff line
@@ -368,3 +368,14 @@ a+0 
44

57

drop table t1;

create table t1 (a bit(3), b bit(12));

insert into t1 values (7,(1<<12)-2), (0x01,0x01ff);

select hex(a),hex(b) from t1;

hex(a)	hex(b)

7	FFE

1	1FF

select hex(concat(a)),hex(concat(b)) from t1;

hex(concat(a))	hex(concat(b))

07	0FFE

01	01FF

drop table t1;