mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	The problem was that when converting a string to an exact number, rounding didn't work, because conversion didn't understand approximate numbers notation. Fix: a new function for string-to-number conversion was implemented, which is aware of approxinate number notation (with decimal point and exponent, e.g. -19.55e-1) include/m_ctype.h: Adding new function into MY_CHARSET_HANDLER Adding prototypes for 8bit and ucs2 functions. mysql-test/r/loaddata.result: Fixing results mysql-test/r/ps_2myisam.result: Fixing results mysql-test/r/ps_3innodb.result: Fixing results mysql-test/r/ps_4heap.result: Fixing results mysql-test/r/ps_5merge.result: Fixing results mysql-test/r/ps_6bdb.result: Fixing results mysql-test/r/rpl_rewrite_db.result: Fixing results mysql-test/r/select.result: Fixing results mysql-test/r/sp-vars.result: Fixing results mysql-test/r/strict.result: Fixing results mysql-test/r/view.result: Fixing results mysql-test/r/warnings.result: Fixing results mysql-test/t/strict.test: Fixing results sql/field.cc: Using new function strings/ctype-big5.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-bin.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-cp932.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-euc_kr.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-eucjpms.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-gb2312.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-gbk.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-latin1.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-simple.c: Implementing my_strntoull10_8bit Adding new function into MY_CHARSET_HANDLER strings/ctype-sjis.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-tis620.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-ucs2.c: Implementing UCS2 wrapper for 8bit version Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-ujis.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-utf8.c: Adding new function into the MY_CHARSET_HANDLER structure mysql-test/r/round.result: New BitKeeper file ``mysql-test/r/round.result'' mysql-test/t/round.test: New BitKeeper file ``mysql-test/t/round.test''
		
			
				
	
	
		
			95 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			95 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| stop slave;
 | |
| drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 | |
| reset master;
 | |
| reset slave;
 | |
| drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 | |
| start slave;
 | |
| drop database if exists mysqltest1;
 | |
| create database mysqltest1;
 | |
| use mysqltest1;
 | |
| create table t1 (a int);
 | |
| insert into t1 values(9);
 | |
| select * from mysqltest1.t1;
 | |
| a
 | |
| 9
 | |
| show databases like 'mysqltest1';
 | |
| Database (mysqltest1)
 | |
| mysqltest1
 | |
| select * from test.t1;
 | |
| a
 | |
| 9
 | |
| drop table t1;
 | |
| drop database mysqltest1;
 | |
| drop database if exists rewrite;
 | |
| create database rewrite;
 | |
| use test;
 | |
| create table t1 (a date, b date, c date not null, d date);
 | |
| load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',';
 | |
| Warnings:
 | |
| Warning	1265	Data truncated for column 'a' at row 1
 | |
| Warning	1265	Data truncated for column 'c' at row 1
 | |
| Warning	1265	Data truncated for column 'd' at row 1
 | |
| Warning	1265	Data truncated for column 'a' at row 2
 | |
| Warning	1265	Data truncated for column 'b' at row 2
 | |
| Warning	1265	Data truncated for column 'd' at row 2
 | |
| load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES;
 | |
| select * from rewrite.t1;
 | |
| a	b	c	d
 | |
| 0000-00-00	NULL	0000-00-00	0000-00-00
 | |
| 0000-00-00	0000-00-00	0000-00-00	0000-00-00
 | |
| 2003-03-03	2003-03-03	2003-03-03	NULL
 | |
| 2003-03-03	2003-03-03	2003-03-03	NULL
 | |
| truncate table t1;
 | |
| load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d);
 | |
| Warnings:
 | |
| Warning	1265	Data truncated for column 'c' at row 1
 | |
| Warning	1265	Data truncated for column 'd' at row 1
 | |
| Warning	1265	Data truncated for column 'b' at row 2
 | |
| Warning	1265	Data truncated for column 'd' at row 2
 | |
| select * from rewrite.t1;
 | |
| a	b	c	d
 | |
| NULL	NULL	0000-00-00	0000-00-00
 | |
| NULL	0000-00-00	0000-00-00	0000-00-00
 | |
| NULL	2003-03-03	2003-03-03	NULL
 | |
| drop table t1;
 | |
| create table t1 (a text, b text);
 | |
| load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
 | |
| Warnings:
 | |
| Warning	1261	Row 3 doesn't contain data for all columns
 | |
| select concat('|',a,'|'), concat('|',b,'|') from rewrite.t1;
 | |
| concat('|',a,'|')	concat('|',b,'|')
 | |
| |Field A|	|Field B|
 | |
| |Field 1|	|Field 2' 
 | |
| Field 3,'Field 4|
 | |
| |Field 5' ,'Field 6|	NULL
 | |
| |Field 6|	| 'Field 7'|
 | |
| drop table t1;
 | |
| create table t1 (a int, b char(10));
 | |
| load data infile '../std_data_ln/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
 | |
| Warnings:
 | |
| Warning	1366	Incorrect integer value: 'error      ' for column 'a' at row 3
 | |
| Warning	1262	Row 3 was truncated; it contained more data than there were input columns
 | |
| Warning	1366	Incorrect integer value: 'wrong end  ' for column 'a' at row 5
 | |
| Warning	1262	Row 5 was truncated; it contained more data than there were input columns
 | |
| select * from rewrite.t1;
 | |
| a	b
 | |
| 1	row 1
 | |
| 2	row 2
 | |
| 0	1234567890
 | |
| 3	row 3
 | |
| 0	1234567890
 | |
| truncate table t1;
 | |
| load data infile '../std_data_ln/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
 | |
| Warnings:
 | |
| Warning	1366	Incorrect integer value: '
 | |
| ' for column 'a' at row 4
 | |
| Warning	1261	Row 4 doesn't contain data for all columns
 | |
| select * from rewrite.t1;
 | |
| a	b
 | |
| 1	row 1
 | |
| 2	row 2
 | |
| 3	row 3
 | |
| 0	
 | |
| drop database rewrite;
 | |
| drop table t1;
 |