1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

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
This commit is contained in:
unknown
2005-01-15 17:38:43 +02:00
parent 2f246d2ff6
commit 6ead860060
13 changed files with 80 additions and 37 deletions

View File

@@ -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;