mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	up a couple of tests and adjusting the output of others. Exposes two bugs (9472 and 9508). BitKeeper/deleted/.del-drop_temp_table.result.es~bc4cfb1ee1257458: Delete: mysql-test/r/drop_temp_table.result.es BitKeeper/deleted/.del-insert_select.result.es~ae7eb9891d6c07c4: Delete: mysql-test/r/insert_select.result.es BitKeeper/deleted/.del-myisam-blob.result.es~d498dae7d9f1a6d4: Delete: mysql-test/r/myisam-blob.result.es BitKeeper/deleted/.del-packet.result.es~6e71c3b634806185: Delete: mysql-test/r/packet.result.es BitKeeper/deleted/.del-query_cache.result.es~246ad731a517d9ab: Delete: mysql-test/r/query_cache.result.es BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079: Delete: mysql-test/r/select.result.es BitKeeper/deleted/.del-type_blob.result.es~a4a0d4454b2d0218: Delete: mysql-test/r/type_blob.result.es BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04: Delete: mysql-test/r/type_float.result.es BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978: Delete: mysql-test/r/type_ranges.result.es mysql-test/mysql-test-run.sh: Remove support for special result extension -- bad idea! mysql-test/t/ps_1general.test: Explain --replace_result mysql-test/r/insert_select.result: Update results mysql-test/r/select.result: Update results mysql-test/r/type_blob.result: Update results mysql-test/r/type_float.result: Update results mysql-test/r/type_ranges.result: Update results mysql-test/t/drop_temp_table.test: Skip this test with embedded server mysql-test/t/insert_select.test: Move binlog test to new file mysql-test/t/select.test: Replace grants column from 'show full columns' mysql-test/t/type_blob.test: Replace grants column from 'show full columns' mysql-test/t/type_float.test: Replace grants column from 'show full columns' mysql-test/t/type_ranges.test: Replace grants column from 'show full columns' sql/sql_select.cc: Fix conditional around query_cache_abort() call.
		
			
				
	
	
		
			26 lines
		
	
	
		
			769 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			26 lines
		
	
	
		
			769 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| create table t1(a int, unique(a));
 | |
| insert into t1 values(2);
 | |
| create table t2(a int);
 | |
| insert into t2 values(1),(2);
 | |
| reset master;
 | |
| insert into t1 select * from t2;
 | |
| ERROR 23000: Duplicate entry '2' for key 1
 | |
| show binlog events;
 | |
| Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 | |
| master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
 | |
| master-bin.000001	79	Query	1	79	use `test`; insert into t1 select * from t2
 | |
| select * from t1;
 | |
| a
 | |
| 1
 | |
| 2
 | |
| drop table t1, t2;
 | |
| create table t1(a int);
 | |
| insert into t1 values(1),(1);
 | |
| reset master;
 | |
| create table t2(unique(a)) select a from t1;
 | |
| ERROR 23000: Duplicate entry '1' for key 1
 | |
| show binlog events;
 | |
| Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 | |
| master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
 | |
| drop table t1;
 |