mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-27 05:56:07 +03:00 
			
		
		
		
	bmove_allign -> bmove_align Added OLAP function ROLLUP Split mysql_fix_privilege_tables to a script and a .sql data file Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects. Added table_alias_charset, for easier --lower-case-table-name handling Better SQL_MODE handling (Setting complex options also sets sub options) New (faster) assembler string functions for x86 BitKeeper/etc/ignore: added libmysqld/sql_state.c client/mysql.cc: Added SQLSTATE to error messages Added new function put_error() to be able to clean up some old code. client/mysqltest.c: Write ERROR SQLSTATE for all errors dbug/dbug.c: Portability fixes include/m_string.h: Rename bmove_allign as bmove_align include/mysql.h: Added SQLSTATE (for embedded version) include/mysql_com.h: Send correct SQLSTATE for the error to the client libmysql/libmysql.c: Changed default error state to HY000 Applied code cleanup patch libmysqld/Makefile.am: Added sql_state.cc libmysqld/libmysqld.c: Added sqlstate mysql-test/r/analyse.result: Updated results mysql-test/r/ansi.result: Updated results mysql-test/r/auto_increment.result: Updated results mysql-test/r/bdb-deadlock.result: Updated results mysql-test/r/bdb.result: Updated results mysql-test/r/comments.result: Updated results mysql-test/r/create.result: Updated results mysql-test/r/ctype_collate.result: Updated results mysql-test/r/delayed.result: Updated results mysql-test/r/delete.result: Updated results mysql-test/r/derived.result: Updated results mysql-test/r/distinct.result: Updated results mysql-test/r/drop.result: Updated results mysql-test/r/err000001.result: Updated results mysql-test/r/explain.result: Updated results mysql-test/r/flush.result: Updated results mysql-test/r/fulltext.result: Updated results mysql-test/r/func_gconcat.result: Updated results mysql-test/r/func_system.result: Updated results mysql-test/r/grant_cache.result: Updated results mysql-test/r/group_by.result: Updated results mysql-test/r/handler.result: Updated results mysql-test/r/heap.result: Updated results mysql-test/r/heap_btree.result: Updated results mysql-test/r/heap_hash.result: Updated results mysql-test/r/innodb.result: Updated results mysql-test/r/innodb_handler.result: Updated results mysql-test/r/insert_select.result: Updated results mysql-test/r/insert_update.result: Updated results mysql-test/r/join.result: Updated results mysql-test/r/join_outer.result: Updated results mysql-test/r/key.result: Updated results mysql-test/r/lock.result: Updated results mysql-test/r/lock_multi.result: Updated results mysql-test/r/merge.result: Updated results mysql-test/r/multi_update.result: Updated results mysql-test/r/myisam.result: Updated results mysql-test/r/null.result: Updated results mysql-test/r/olap.result: Updated results mysql-test/r/order_by.result: Updated results mysql-test/r/packet.result: Updated results mysql-test/r/query_cache.result: Updated results mysql-test/r/row.result: Updated results mysql-test/r/rpl000001.result: Updated results mysql-test/r/rpl000009.result: Updated results mysql-test/r/rpl_empty_master_crash.result: Updated results mysql-test/r/rpl_log.result: Updated results mysql-test/r/rpl_replicate_do.result: Updated results mysql-test/r/rpl_rotate_logs.result: Updated results mysql-test/r/select.result: Updated results mysql-test/r/select_safe.result: Updated results mysql-test/r/show_check.result: Updated results mysql-test/r/sql_mode.result: Updated results mysql-test/r/subselect.result: Updated results mysql-test/r/temp_table.result: Updated results mysql-test/r/truncate.result: Updated results mysql-test/r/type_blob.result: Updated results mysql-test/r/type_decimal.result: Updated results mysql-test/r/type_float.result: Updated results mysql-test/r/type_ranges.result: Updated results mysql-test/r/union.result: Updated results mysql-test/r/update.result: Updated results mysql-test/r/user_var.result: Updated results mysql-test/r/varbinary.result: Updated results mysql-test/r/variables.result: Updated results mysql-test/t/ansi.test: Test of sql_mode mysql-test/t/derived.test: Updated results mysql-test/t/func_system.test: Make this independen of the MySQL server name mysql-test/t/lowercase_table.test: Cleanup mysql-test/t/olap.test: A lot of new tests mysql-test/t/sql_mode.test: More test for sql_mode mysql-test/t/subselect.test: Added a few new tests (to find a bug in the item_ref code) scripts/Makefile.am: Added mysql_fix_privilege_tables.sql scripts/mysql_fix_privilege_tables.sh: Totally new script. This bascily just pipes mysql_fix_privilege_tables.sql through 'mysql' to 'mysqld' sql/Makefile.am: Added sql_state.cc sql/item.cc: Extended Item_field::eq() to be able to better match GROUP BY fields on the command line. Needed for ROLLUP sql/item.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/item_sum.cc: Moved copy_or_same() and some reset() functions from item_sum.h Needed to be able to access thd->mem_root. sql/item_sum.h: Moved some functions to item_sum.cc Added make_unique() for ROLLUP sql/item_uniq.h: Fixed return value sql/mysql_priv.h: Updated MODE flags sql/mysqld.cc: Added ANSI as it's own mode Moved charset_info variables here Cleaned up handler_count handling (for NT) Added table_alias_charset, for easier --lower-case-table-name handling sql/net_serv.cc: New comment sql/protocol.cc: Send SQLSTATE to client sql/set_var.cc: Better SQL_MODE handling (Setting complex options also sets sub options) sql/set_var.h: Better SQL_MODE handling sql/sql_base.cc: Make alias depend on --lower-case-table-names Make find_item_in_list also check database name sql/sql_cache.cc: Indentation cleanup sql/sql_list.h: Added safety assert Addes support of alloc without current_thd() sql/sql_prepare.cc: Update after prototype change sql/sql_select.cc: Added ROLLUP sql/sql_select.h: structures for rollup sql/sql_show.cc: Easier SQL_MODE handling sql/sql_string.cc: Move CHARSET_INFO to mysqld (to be together with all other global variables) sql/sql_string.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/sql_table.cc: Simpler --lower-case-table-name handling sql/sql_union.cc: Update after prototype change sql/sql_yacc.yy: ROLLUP sql/unireg.h: bmove_allign ->bmove_align strings/Makefile.am: Fix to be able to compile str_test.c strings/ctype.c: Removed empty lines strings/str_test.c: Added test of bmove_align strings/strings-x86.s: Faster bmove_align, bmove_upp and strmake strings/strings.asm: move_allg
		
			
				
	
	
		
			335 lines
		
	
	
		
			9.3 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			335 lines
		
	
	
		
			9.3 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| drop table if exists t1,t2,t3;
 | |
| create table t1(id1 int not null auto_increment primary key, t char(12));
 | |
| create table t2(id2 int not null, t char(12));
 | |
| create table t3(id3 int not null, t char(12), index(id3));
 | |
| select count(*) from t1 where id1 > 95;
 | |
| count(*)
 | |
| 5
 | |
| select count(*) from t2 where id2 > 95;
 | |
| count(*)
 | |
| 25
 | |
| select count(*) from t3 where id3 > 95;
 | |
| count(*)
 | |
| 250
 | |
| update t1,t2,t3 set t1.t="aaa", t2.t="bbb", t3.t="cc" where  t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 90;
 | |
| select count(*) from t1 where t = "aaa";
 | |
| count(*)
 | |
| 10
 | |
| select count(*) from t1 where id1 > 90;
 | |
| count(*)
 | |
| 10
 | |
| select count(*) from t2 where t = "bbb";
 | |
| count(*)
 | |
| 50
 | |
| select count(*) from t2 where id2 > 90;
 | |
| count(*)
 | |
| 50
 | |
| select count(*) from t3 where t = "cc";
 | |
| count(*)
 | |
| 500
 | |
| select count(*) from t3 where id3 > 90;
 | |
| count(*)
 | |
| 500
 | |
| delete t1.*, t2.*, t3.*  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 95;
 | |
| check table t1, t2, t3;
 | |
| Table	Op	Msg_type	Msg_text
 | |
| test.t1	check	status	OK
 | |
| test.t2	check	status	OK
 | |
| test.t3	check	status	OK
 | |
| select count(*) from t1 where id1 > 95;
 | |
| count(*)
 | |
| 0
 | |
| select count(*) from t2 where id2 > 95;
 | |
| count(*)
 | |
| 0
 | |
| select count(*) from t3 where id3 > 95;
 | |
| count(*)
 | |
| 0
 | |
| delete t1, t2, t3  from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 5;
 | |
| select count(*) from t1 where id1 > 5;
 | |
| count(*)
 | |
| 0
 | |
| select count(*) from t2 where id2 > 5;
 | |
| count(*)
 | |
| 0
 | |
| select count(*) from t3 where id3 > 5;
 | |
| count(*)
 | |
| 0
 | |
| delete from t1, t2, t3  using t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3  and t1.id1 > 0;
 | |
| select count(*) from t1 where id1;
 | |
| count(*)
 | |
| 0
 | |
| select count(*) from t2 where id2;
 | |
| count(*)
 | |
| 0
 | |
| select count(*) from t3 where id3;
 | |
| count(*)
 | |
| 0
 | |
| drop table t1,t2,t3;
 | |
| create table t1(id1 int not null  primary key, t varchar(100)) pack_keys = 1;
 | |
| create table t2(id2 int not null, t varchar(100), index(id2)) pack_keys = 1;
 | |
| delete t1  from t1,t2 where t1.id1 = t2.id2 and t1.id1 > 500;
 | |
| drop table t1,t2;
 | |
| CREATE TABLE t1 (
 | |
| id int(11) NOT NULL default '0',
 | |
| name varchar(10) default NULL,
 | |
| PRIMARY KEY  (id)
 | |
| ) TYPE=MyISAM;
 | |
| INSERT INTO t1 VALUES (1,'aaa'),(2,'aaa'),(3,'aaa');
 | |
| CREATE TABLE t2 (
 | |
| id int(11) NOT NULL default '0',
 | |
| name varchar(10) default NULL,
 | |
| PRIMARY KEY  (id)
 | |
| ) TYPE=MyISAM;
 | |
| INSERT INTO t2 VALUES (2,'bbb'),(3,'bbb'),(4,'bbb');
 | |
| CREATE TABLE t3 (
 | |
| id int(11) NOT NULL default '0',
 | |
| mydate datetime default NULL,
 | |
| PRIMARY KEY  (id)
 | |
| ) TYPE=MyISAM;
 | |
| INSERT INTO t3 VALUES (1,'2002-02-04 00:00:00'),(3,'2002-05-12 00:00:00'),(5,'2002-05-12 00:00:00'),(6,'2002-06-22
 | |
| 00:00:00'),(7,'2002-07-22 00:00:00');
 | |
| delete t1,t2,t3 from t1,t2,t3 where to_days(now())-to_days(t3.mydate)>=30 and t3.id=t1.id and t3.id=t2.id;
 | |
| select * from t3;
 | |
| id	mydate
 | |
| 1	2002-02-04 00:00:00
 | |
| 5	2002-05-12 00:00:00
 | |
| 6	2002-06-22 00:00:00
 | |
| 7	2002-07-22 00:00:00
 | |
| DROP TABLE t1,t2,t3;
 | |
| CREATE TABLE IF NOT EXISTS `t1` (
 | |
| `id` int(11) NOT NULL auto_increment,
 | |
| `tst` text,
 | |
| `tst1` text,
 | |
| PRIMARY KEY  (`id`)
 | |
| ) TYPE=MyISAM;
 | |
| CREATE TABLE IF NOT EXISTS `t2` (
 | |
| `ID` int(11) NOT NULL auto_increment,
 | |
| `ParId` int(11) default NULL,
 | |
| `tst` text,
 | |
| `tst1` text,
 | |
| PRIMARY KEY  (`ID`),
 | |
| KEY `IX_ParId_t2` (`ParId`),
 | |
| FOREIGN KEY (`ParId`) REFERENCES `t1` (`id`)
 | |
| ) TYPE=MyISAM;
 | |
| INSERT INTO t1(tst,tst1) VALUES("MySQL","MySQL AB"), ("MSSQL","Microsoft"), ("ORACLE","ORACLE");
 | |
| INSERT INTO t2(ParId) VALUES(1), (2), (3);
 | |
| select * from t2;
 | |
| ID	ParId	tst	tst1
 | |
| 1	1	NULL	NULL
 | |
| 2	2	NULL	NULL
 | |
| 3	3	NULL	NULL
 | |
| UPDATE t2, t1 SET t2.tst = t1.tst, t2.tst1 = t1.tst1 WHERE t2.ParId = t1.Id;
 | |
| select * from t2;
 | |
| ID	ParId	tst	tst1
 | |
| 1	1	MySQL	MySQL AB
 | |
| 2	2	MSSQL	Microsoft
 | |
| 3	3	ORACLE	ORACLE
 | |
| drop table t1, t2 ;
 | |
| create table t1 (n numeric(10));
 | |
| create table t2 (n numeric(10));
 | |
| insert into t2 values (1),(2),(4),(8),(16),(32);
 | |
| select * from t2 left outer join t1  using (n);
 | |
| n	n
 | |
| 1	NULL
 | |
| 2	NULL
 | |
| 4	NULL
 | |
| 8	NULL
 | |
| 16	NULL
 | |
| 32	NULL
 | |
| delete  t1,t2 from t2 left outer join t1  using (n);
 | |
| select * from t2 left outer join t1  using (n);
 | |
| n	n
 | |
| drop table t1,t2 ;
 | |
| create table t1 (n int(10) not null primary key, d int(10));
 | |
| create table t2 (n int(10) not null primary key, d int(10));
 | |
| insert into t1 values(1,1);
 | |
| insert into t2 values(1,10),(2,20);
 | |
| LOCK TABLES t1 write, t2 read;
 | |
| DELETE t1.*, t2.* FROM t1,t2 where t1.n=t2.n;
 | |
| ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
 | |
| UPDATE t1,t2 SET t1.d=t2.d,t2.d=30 WHERE t1.n=t2.n;
 | |
| ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
 | |
| UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
 | |
| ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
 | |
| unlock tables;
 | |
| LOCK TABLES t1 write, t2 write;
 | |
| UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
 | |
| select * from t1;
 | |
| n	d
 | |
| 1	10
 | |
| DELETE t1.*, t2.* FROM t1,t2 where t1.n=t2.n;
 | |
| select * from t1;
 | |
| n	d
 | |
| select * from t2;
 | |
| n	d
 | |
| 2	20
 | |
| unlock tables;
 | |
| drop table t1,t2;
 | |
| set sql_safe_updates=1;
 | |
| create table t1 (n int(10), d int(10));
 | |
| create table t2 (n int(10), d int(10));
 | |
| insert into t1 values(1,1);
 | |
| insert into t2 values(1,10),(2,20);
 | |
| UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
 | |
| ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
 | |
| set sql_safe_updates=0;
 | |
| drop table t1,t2;
 | |
| set timestamp=1038401397;
 | |
| create table t1 (n int(10) not null primary key, d int(10), t timestamp);
 | |
| create table t2 (n int(10) not null primary key, d int(10), t timestamp);
 | |
| insert into t1 values(1,1,NULL);
 | |
| insert into t2 values(1,10,NULL),(2,20,NULL);
 | |
| set timestamp=1038000000;
 | |
| UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
 | |
| select n,d,unix_timestamp(t) from t1;
 | |
| n	d	unix_timestamp(t)
 | |
| 1	10	1038000000
 | |
| select n,d,unix_timestamp(t) from t2;
 | |
| n	d	unix_timestamp(t)
 | |
| 1	10	1038401397
 | |
| 2	20	1038401397
 | |
| UPDATE t1,t2 SET 1=2 WHERE t1.n=t2.n;
 | |
| ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '1=2 WHERE t1.n=t2.n' at line 1
 | |
| drop table t1,t2;
 | |
| set timestamp=0;
 | |
| set sql_safe_updates=0;
 | |
| create table t1 (n int(10) not null primary key, d int(10));
 | |
| create table t2 (n int(10) not null primary key, d int(10));
 | |
| insert into t1 values(1,1), (3,3);
 | |
| insert into t2 values(1,10),(2,20);
 | |
| UPDATE t2 left outer join t1 on t1.n=t2.n  SET t1.d=t2.d;
 | |
| select * from t1;
 | |
| n	d
 | |
| 1	10
 | |
| 3	3
 | |
| select * from t2;
 | |
| n	d
 | |
| 1	10
 | |
| 2	20
 | |
| drop table t1,t2;
 | |
| create table t1 (n int(10), d int(10));
 | |
| create table t2 (n int(10), d int(10));
 | |
| insert into t1 values(1,1),(1,2);
 | |
| insert into t2 values(1,10),(2,20);
 | |
| UPDATE t1,t2 SET t1.d=t2.d,t2.d=30 WHERE t1.n=t2.n;
 | |
| select * from t1;
 | |
| n	d
 | |
| 1	10
 | |
| 1	10
 | |
| select * from t2;
 | |
| n	d
 | |
| 1	30
 | |
| 2	20
 | |
| drop table t1,t2;
 | |
| create table t1 (n int(10), d int(10));
 | |
| create table t2 (n int(10), d int(10));
 | |
| insert into t1 values(1,1),(3,2);
 | |
| insert into t2 values(1,10),(1,20);
 | |
| UPDATE t1,t2 SET t1.d=t2.d,t2.d=30 WHERE t1.n=t2.n;
 | |
| select * from t1;
 | |
| n	d
 | |
| 1	10
 | |
| 3	2
 | |
| select * from t2;
 | |
| n	d
 | |
| 1	30
 | |
| 1	30
 | |
| UPDATE t1 a ,t2 b SET a.d=b.d,b.d=30 WHERE a.n=b.n;
 | |
| select * from t1;
 | |
| n	d
 | |
| 1	30
 | |
| 3	2
 | |
| select * from t2;
 | |
| n	d
 | |
| 1	30
 | |
| 1	30
 | |
| DELETE t1, t2  FROM t1 a,t2 b where a.n=b.n;
 | |
| select * from t1;
 | |
| n	d
 | |
| 3	2
 | |
| select * from t2;
 | |
| n	d
 | |
| drop table t1,t2;
 | |
| CREATE TABLE t1 ( broj int(4) unsigned NOT NULL default '0',  naziv char(25) NOT NULL default 'NEPOZNAT',  PRIMARY KEY  (broj)) TYPE=MyISAM;
 | |
| INSERT INTO t1 VALUES (1,'jedan'),(2,'dva'),(3,'tri'),(4,'xxxxxxxxxx'),(5,'a'),(10,''),(11,''),(12,''),(13,'');
 | |
| CREATE TABLE t2 ( broj int(4) unsigned NOT NULL default '0',  naziv char(25) NOT NULL default 'NEPOZNAT',  PRIMARY KEY  (broj)) TYPE=MyISAM;
 | |
| INSERT INTO t2 VALUES (1,'jedan'),(2,'dva'),(3,'tri'),(4,'xxxxxxxxxx'),(5,'a');
 | |
| CREATE TABLE t3 ( broj int(4) unsigned NOT NULL default '0',  naziv char(25) NOT NULL default 'NEPOZNAT',  PRIMARY KEY  (broj)) TYPE=MyISAM;
 | |
| INSERT INTO t3 VALUES (1,'jedan'),(2,'dva');
 | |
| update t1,t2 set t1.naziv="aaaa" where t1.broj=t2.broj;
 | |
| update t1,t2,t3 set t1.naziv="bbbb", t2.naziv="aaaa" where t1.broj=t2.broj and t2.broj=t3.broj;
 | |
| drop table t1,t2,t3;
 | |
| CREATE TABLE t1 (a int not null primary key, b int not null, key (b));
 | |
| CREATE TABLE t2 (a int not null primary key, b int not null, key (b));
 | |
| INSERT INTO t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9);
 | |
| INSERT INTO t2 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9);
 | |
| update t1,t2 set t1.a=t1.a+100;
 | |
| select * from t1;
 | |
| a	b
 | |
| 101	1
 | |
| 102	2
 | |
| 103	3
 | |
| 104	4
 | |
| 105	5
 | |
| 106	6
 | |
| 107	7
 | |
| 108	8
 | |
| 109	9
 | |
| update t1,t2 set t1.a=t1.a+100 where t1.a=101;
 | |
| select * from t1;
 | |
| a	b
 | |
| 201	1
 | |
| 102	2
 | |
| 103	3
 | |
| 104	4
 | |
| 105	5
 | |
| 106	6
 | |
| 107	7
 | |
| 108	8
 | |
| 109	9
 | |
| update t1,t2 set t1.b=t1.b+10 where t1.b=2;
 | |
| select * from t1;
 | |
| a	b
 | |
| 201	1
 | |
| 102	12
 | |
| 103	3
 | |
| 104	4
 | |
| 105	5
 | |
| 106	6
 | |
| 107	7
 | |
| 108	8
 | |
| 109	9
 | |
| update t1,t2 set t1.b=t1.b+2,t2.b=t1.b+10 where t1.b between 3 and 5 and t2.a=t1.a-100;
 | |
| select * from t1;
 | |
| a	b
 | |
| 201	1
 | |
| 102	12
 | |
| 103	5
 | |
| 104	6
 | |
| 105	7
 | |
| 106	6
 | |
| 107	7
 | |
| 108	8
 | |
| 109	9
 | |
| select * from t2;
 | |
| a	b
 | |
| 1	1
 | |
| 2	2
 | |
| 3	13
 | |
| 4	14
 | |
| 5	15
 | |
| 6	6
 | |
| 7	7
 | |
| 8	8
 | |
| 9	9
 | |
| drop table t1,t2;
 | |
| CREATE TABLE t3 (  KEY1 varchar(50) NOT NULL default '',  PARAM_CORR_DISTANCE_RUSH double default NULL,  PARAM_CORR_DISTANCE_GEM double default NULL,  PARAM_AVG_TARE double default NULL,  PARAM_AVG_NB_DAYS double default NULL,  PARAM_DEFAULT_PROP_GEM_SRVC varchar(50) default NULL,  PARAM_DEFAULT_PROP_GEM_NO_ETIK varchar(50) default NULL,  PARAM_SCENARIO_COSTS varchar(50) default NULL,  PARAM_DEFAULT_WAGON_COST double default NULL,  tmp int(11) default NULL,  PRIMARY KEY  (KEY1)) TYPE=MyISAM;
 | |
| INSERT INTO t3 VALUES ('A',1,1,22,3.2,'R','R','BASE2',0.24,NULL);
 | |
| create table t1 (A varchar(1));
 | |
| insert into t1 values  ("A") ,("B"),("C"),("D");
 | |
| create table t2(Z varchar(15));
 | |
| insert into t2(Z)  select concat(a.a,b.a,c.a,d.a) from t1 as a, t1 as b, t1 as c, t1 as d;
 | |
| update t2,t3 set Z =param_scenario_costs;
 | |
| drop table t1,t2,t3;
 |