1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-merge fix.

Browse Source
This commit is contained in:
igor@olga.mysql.com 2007-02-13 13:15:23 -08:00
parent fb9e0ad3be
commit 273d016aad
10 changed files with 31 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/r/information_schema.result
View File

@ -1377,10 +1377,21 @@ COLLATIONS information_schema.COLLATIONS 1
COLLATION_CHARACTER_SET_APPLICABILITY information_schema.COLLATION_CHARACTER_SET_APPLICABILITY 1 COLLATION_CHARACTER_SET_APPLICABILITY information_schema.COLLATION_CHARACTER_SET_APPLICABILITY 1
COLUMNS information_schema.COLUMNS 1 COLUMNS information_schema.COLUMNS 1
COLUMN_PRIVILEGES information_schema.COLUMN_PRIVILEGES 1 COLUMN_PRIVILEGES information_schema.COLUMN_PRIVILEGES 1
ENGINES information_schema.ENGINES 1
EVENTS information_schema.EVENTS 1
FILES information_schema.FILES 1
GLOBAL_STATUS information_schema.GLOBAL_STATUS 1
GLOBAL_VARIABLES information_schema.GLOBAL_VARIABLES 1
KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1 KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1
PARTITIONS information_schema.PARTITIONS 1
PLUGINS information_schema.PLUGINS 1
PROCESSLIST information_schema.PROCESSLIST 1
REFERENTIAL_CONSTRAINTS information_schema.REFERENTIAL_CONSTRAINTS 1
ROUTINES information_schema.ROUTINES 1 ROUTINES information_schema.ROUTINES 1
SCHEMATA information_schema.SCHEMATA 1 SCHEMATA information_schema.SCHEMATA 1
SCHEMA_PRIVILEGES information_schema.SCHEMA_PRIVILEGES 1 SCHEMA_PRIVILEGES information_schema.SCHEMA_PRIVILEGES 1
SESSION_STATUS information_schema.SESSION_STATUS 1
SESSION_VARIABLES information_schema.SESSION_VARIABLES 1
STATISTICS information_schema.STATISTICS 1 STATISTICS information_schema.STATISTICS 1
TABLES information_schema.TABLES 1 TABLES information_schema.TABLES 1
TABLE_CONSTRAINTS information_schema.TABLE_CONSTRAINTS 1 TABLE_CONSTRAINTS information_schema.TABLE_CONSTRAINTS 1

14
mysql-test/r/insert_select.result
View File

@ -717,17 +717,3 @@ select * from t1;
f1 f2 f1 f2
1 2 1 2
drop table t1; drop table t1;
create table t1(f1 int primary key auto_increment, f2 int unique);
insert into t1(f2) values(1);
select @@identity;
@@identity
1
insert ignore t1(f2) values(1);
select @@identity;
@@identity
0
insert ignore t1(f2) select 1;
select @@identity;
@@identity
0
drop table t1;

6
mysql-test/r/update.result
View File

@ -414,7 +414,7 @@ Handler_read_key 2
Handler_read_next 0 Handler_read_next 0
Handler_read_prev 0 Handler_read_prev 0
Handler_read_rnd 0 Handler_read_rnd 0
Handler_read_rnd_next 7 Handler_read_rnd_next 0
UPDATE t1 SET user_id=null WHERE request_id=9999999999999; UPDATE t1 SET user_id=null WHERE request_id=9999999999999;
show status like '%Handler_read%'; show status like '%Handler_read%';
Variable_name Value Variable_name Value
@ -423,7 +423,7 @@ Handler_read_key 3
Handler_read_next 0 Handler_read_next 0
Handler_read_prev 0 Handler_read_prev 0
Handler_read_rnd 0 Handler_read_rnd 0
Handler_read_rnd_next 14 Handler_read_rnd_next 0
UPDATE t1 SET user_id=null WHERE request_id=999999999999999999999999999999; UPDATE t1 SET user_id=null WHERE request_id=999999999999999999999999999999;
show status like '%Handler_read%'; show status like '%Handler_read%';
Variable_name Value Variable_name Value
@ -432,5 +432,5 @@ Handler_read_key 3
Handler_read_next 0 Handler_read_next 0
Handler_read_prev 0 Handler_read_prev 0
Handler_read_rnd 0 Handler_read_rnd 0
Handler_read_rnd_next 21 Handler_read_rnd_next 0
DROP TABLE t1; DROP TABLE t1;

8
mysql-test/r/view.result
View File

@ -3079,8 +3079,8 @@ f1 f2
1 3 1 3
2 3 2 3
explain extended select * from v1; explain extended select * from v1;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 6 Using filesort 1 SIMPLE t1 ALL NULL NULL NULL NULL 6 100.00 Using filesort
Warnings: Warnings:
Note 1003 select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` order by `test`.`t1`.`f2` Note 1003 select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` order by `test`.`t1`.`f2`
select * from v1 order by f1; select * from v1 order by f1;
@ -3092,8 +3092,8 @@ f1 f2
2 2 2 2
2 3 2 3
explain extended select * from v1 order by f1; explain extended select * from v1 order by f1;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 6 Using filesort 1 SIMPLE t1 ALL NULL NULL NULL NULL 6 100.00 Using filesort
Warnings: Warnings:
Note 1003 select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` order by `test`.`t1`.`f1`,`test`.`t1`.`f2` Note 1003 select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` order by `test`.`t1`.`f1`,`test`.`t1`.`f2`
drop view v1; drop view v1;

13
mysql-test/t/insert_select.test
View File

@ -279,16 +279,3 @@ insert into t1 values (1,1) on duplicate key update f2=2;
--disable_info --disable_info
select * from t1; select * from t1;
drop table t1; drop table t1;
#
# Bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT if no rows
# were inserted.
#
create table t1(f1 int primary key auto_increment, f2 int unique);
insert into t1(f2) values(1);
select @@identity;
insert ignore t1(f2) values(1);
select @@identity;
insert ignore t1(f2) select 1;
select @@identity;
drop table t1;

15
mysql-test/t/view.test
View File

@ -748,12 +748,12 @@ drop view v1;
# #
# VIEWs with national characters # VIEWs with national characters
# #
create table tü (cü char); create table tü (cü char);
create view vü as select cü from tü; create view vü as select cü from tü;
insert into vü values ('ü'); insert into vü values ('ü');
select * from vü; select * from vü;
drop view vü; drop view vü;
drop table tü; drop table tü;
# #
# problem with used_tables() of outer reference resolved in VIEW # problem with used_tables() of outer reference resolved in VIEW
@ -2951,7 +2951,7 @@ DROP VIEW v;
# #
# BUG#24293: '\Z' token is not handled correctly in views # BUG#24293: '\Z' token is not handled correctly in views
# #
--disable_warnings --disable_warnings
DROP VIEW IF EXISTS v1; DROP VIEW IF EXISTS v1;
--enable_warnings --enable_warnings
@ -3016,6 +3016,7 @@ drop view v1;
drop table t1; drop table t1;
--echo End of 5.0 tests. --echo End of 5.0 tests.
# Bug #16813 (WITH CHECK OPTION doesn't work with UPDATE) # Bug #16813 (WITH CHECK OPTION doesn't work with UPDATE)
# #
CREATE TABLE t1(id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, val INT UNSIGNED NOT NULL); CREATE TABLE t1(id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, val INT UNSIGNED NOT NULL);

2
sql/mysql_priv.h
View File

@ -828,7 +828,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
char* packet, uint packet_length); char* packet, uint packet_length);
void log_slow_statement(THD *thd); void log_slow_statement(THD *thd);
bool check_dup(const char *db, const char *name, TABLE_LIST *tables); bool check_dup(const char *db, const char *name, TABLE_LIST *tables);
bool compare_record(TABLE *table, query_id_t query_id); bool compare_record(TABLE *table);
bool append_file_to_dir(THD *thd, const char **filename_ptr, bool append_file_to_dir(THD *thd, const char **filename_ptr,
const char *table_name); const char *table_name);

2
sql/opt_range.cc
View File

@ -10173,7 +10173,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::reset(void)
DBUG_ENTER("QUICK_GROUP_MIN_MAX_SELECT::reset"); DBUG_ENTER("QUICK_GROUP_MIN_MAX_SELECT::reset");
file->extra(HA_EXTRA_KEYREAD); /* We need only the key attributes */ file->extra(HA_EXTRA_KEYREAD); /* We need only the key attributes */
if ((result= file->ha_index_init(index))) if ((result= file->ha_index_init(index,1)))
DBUG_RETURN(result); DBUG_RETURN(result);
if (quick_prefix_select && quick_prefix_select->reset()) if (quick_prefix_select && quick_prefix_select->reset())
DBUG_RETURN(1); DBUG_RETURN(1);

4
sql/sql_insert.cc
View File

@ -1208,8 +1208,8 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
} }
goto err; goto err;
} }
if ((table->file->table_flags() & HA_PARTIAL_COLUMN_READ) || if ((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) ||
compare_record(table, query_id)) compare_record(table))
{ {
info->updated++; info->updated++;
/* /*

2
sql/sql_update.cc
View File

@ -26,7 +26,7 @@
/* Return 0 if row hasn't changed */ /* Return 0 if row hasn't changed */
bool compare_record(TABLE *table, query_id_t query_id) bool compare_record(TABLE *table)
{ {
if (table->s->blob_fields + table->s->varchar_fields == 0) if (table->s->blob_fields + table->s->varchar_fields == 0)
return cmp_record(table,record[1]); return cmp_record(table,record[1]);