mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	Noteworthy: - New HANDLER code - New multi-update-grant-check code - Table lock code in ha_innodb.cc was not applied BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e: Auto merged Build-tools/mysql-copyright-2: Auto merged acinclude.m4: Auto merged client/mysqladmin.c: Auto merged client/mysqldump.c: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/myisam.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/buf/buf0buf.c: Auto merged ltmain.sh: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/row/row0row.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/ut/ut0dbg.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_close.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_locking.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/r/delete.result: Auto merged mysql-test/r/func_if.result: Auto merged Build-tools/mysql-copyright: Merge with 4.0 (too most of the code from 4.0) Makefile.am: merge client/mysql.cc: Used 4.1 code configure.in: merge innobase/os/os0file.c: merge innobase/row/row0mysql.c: merge mysql-test/r/ctype_latin1_de.result: merge mysql-test/r/flush_table.result: merge mysql-test/r/func_str.result: merge mysql-test/r/handler.result: merge mysql-test/r/multi_update.result: merge mysql-test/r/type_timestamp.result: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/r/update.result: merge mysql-test/t/delete.test: merge mysql-test/t/flush_table.test: merge mysql-test/t/func_str.test: merge mysql-test/t/handler.test: merge mysql-test/t/multi_update.test: merge mysql-test/t/type_timestamp.test: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/t/update.test: merge mysys/errors.c: merge mysys/my_fstream.c: merge mysys/my_pread.c: merge mysys/my_write.c: merge mysys/mysys_priv.h: merge scripts/mysqlhotcopy.sh: merge sql/field.cc: Keep code from 4.1 sql/field.h: Keep code from 4.1 sql/ha_innodb.cc: Don't merge lock code from 4.0; Heikki will look at this sql/ha_myisam.cc: merge sql/handler.cc: merge sql/item_cmpfunc.cc: merge sql/item_cmpfunc.h: merge sql/item_strfunc.cc: merge sql/mysql_priv.h: merge sql/mysqld.cc: merge sql/protocol.cc: merge sql/records.cc: merge sql/repl_failsafe.cc: merge mysql-test/r/lock_multi.result: merge mysql-test/t/ctype_latin1_de.test: merge mysql-test/t/func_if.test: merge mysql-test/t/lock_multi.test: merge sql/repl_failsafe.h: merge Remove unnessessary header protection sql/slave.h: merge sql/sql_acl.cc: merge sql/sql_base.cc: merge sql/sql_cache.cc: auto merge sql/sql_class.cc: merge sql/sql_class.h: merge sql/sql_delete.cc: merge sql/sql_handler.cc: Get new HANDLER code into 4.1 sql/sql_parse.cc: Keep old file sql/sql_repl.cc: merge sql/sql_repl.h: merge sql/sql_show.cc: merge sql/sql_table.cc: merge sql/sql_union.cc: Applied the examine_rows bug fix from 4.0 by hand sql/sql_update.cc: New multi-update-grant-check code from 4.0 sql/sql_yacc.yy: New multi-update-grant-check code from 4.0 sql/stacktrace.c: merge sql/table.h: merge
		
			
				
	
	
		
			75 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			75 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| # TODO: Only run this if we have privilege to do flush table
 | |
| 
 | |
| #
 | |
| # Test of flush table
 | |
| #
 | |
| 
 | |
| --disable_warnings
 | |
| drop table if exists t1,t2;
 | |
| --enable_warnings
 | |
| create table t1 (a int not null auto_increment primary key);
 | |
| insert into t1 values(0);
 | |
| lock table t1 read;
 | |
| flush table t1;
 | |
| check table t1;
 | |
| drop table t1;
 | |
| 
 | |
| #
 | |
| # In the following test FLUSH TABLES produces a deadlock
 | |
| # (hang forever) if the fix for BUG #3565 is missing.
 | |
| # And it shows that handler tables are re-opened after flush (BUG #4286).
 | |
| #
 | |
| create table t1(table_id char(20) primary key);
 | |
| create table t2(table_id char(20) primary key);
 | |
| insert into t1 values ('test.t1');
 | |
| insert into t1 values ('');
 | |
| insert into t2 values ('test.t2');
 | |
| insert into t2 values ('');
 | |
| handler t1 open as a1;
 | |
| handler t1 open as a2;
 | |
| handler t2 open;
 | |
| handler a1 read first limit 9;
 | |
| handler a2 read first limit 9;
 | |
| handler t2 read first limit 9;
 | |
| flush tables;
 | |
| handler a1 read first limit 9;
 | |
| handler a2 read first limit 9;
 | |
| handler t2 read first limit 9;
 | |
| #
 | |
| --error 1066
 | |
| handler t1 open as a1;
 | |
| --error 1066
 | |
| handler t1 open as a2;
 | |
| --error 1066
 | |
| handler t2 open;
 | |
| handler a1 read first limit 9;
 | |
| handler a2 read first limit 9;
 | |
| handler t2 read first limit 9;
 | |
| flush table t1;
 | |
| handler a1 read first limit 9;
 | |
| handler a2 read first limit 9;
 | |
| handler t2 read first limit 9;
 | |
| flush table t2;
 | |
| handler t2 close;
 | |
| drop table t1;
 | |
| drop table t2;
 | |
| 
 | |
| #
 | |
| # The fix for BUG #4286 cannot restore the position after a flush.
 | |
| #
 | |
| create table t1(table_id char(20) primary key);
 | |
| insert into t1 values ('Record-01');
 | |
| insert into t1 values ('Record-02');
 | |
| insert into t1 values ('Record-03');
 | |
| insert into t1 values ('Record-04');
 | |
| insert into t1 values ('Record-05');
 | |
| handler t1 open;
 | |
| handler t1 read first limit 1;
 | |
| handler t1 read next limit 1;
 | |
| handler t1 read next limit 1;
 | |
| flush table t1;
 | |
| handler t1 read next limit 1;
 | |
| handler t1 read next limit 1;
 | |
| handler t1 close;
 | |
| drop table t1;
 |