database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/func_group.result:
  Manual merge
mysql-test/r/loaddata.result:
  Manual merge
mysql-test/r/type_decimal.result:
  Manual merge
mysql-test/r/union.result:
  Manual merge
sql/field_conv.cc:
  aborting fix for 7589
sql/opt_sum.cc:
  Manual merge
sql/sql_load.cc:
  Manual merge
sql/sql_yacc.yy:
  Aborting fix for 11553
This commit is contained in:
unknown
2005-09-23 09:18:56 +02:00
parent abda6dc69f 727f0b8a1f
commit 129300f13d
31 changed files with 1334 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/loaddata.result
View File

@ -66,6 +66,16 @@ a b
3 row 3
0
drop table t1;
SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE=NO_AUTO_VALUE_ON_ZERO;
create table t1(id integer not null auto_increment primary key);
insert into t1 values(0);
select * from t1;
id
0
select * from t1;
id
0
SET @@SQL_MODE=@OLD_SQL_MODE;
create table t1 (a int default 100, b int, c varchar(60));
load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b);
select * from t1;