Below is the list of changes that have just been committed into a local
5.1 repository of igor. When igor does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-02-13 13:15:23-08:00, igor@stripped +10 -0
Post-merge fix.
mysql-test/r/information_schema.result@stripped, 2007-02-13 13:15:18-08:00, igor@stripped +11 -0
Post-merge fix.
mysql-test/r/insert_select.result@stripped, 2007-02-13 13:15:19-08:00, igor@stripped +0 -14
Post-merge fix.
mysql-test/r/update.result@stripped, 2007-02-13 13:15:19-08:00, igor@stripped +3 -3
Post-merge fix.
mysql-test/r/view.result@stripped, 2007-02-13 13:15:19-08:00, igor@stripped +4 -4
Post-merge fix.
mysql-test/t/insert_select.test@stripped, 2007-02-13 13:15:19-08:00, igor@stripped +0 -13
Post-merge fix.
mysql-test/t/view.test@stripped, 2007-02-13 13:15:19-08:00, igor@stripped +8 -7
Post-merge fix.
sql/mysql_priv.h@stripped, 2007-02-13 13:15:19-08:00, igor@stripped +1 -1
Post-merge fix.
sql/opt_range.cc@stripped, 2007-02-13 13:15:19-08:00, igor@stripped +1 -1
Post-merge fix.
sql/sql_insert.cc@stripped, 2007-02-13 13:15:19-08:00, igor@stripped +2 -2
Post-merge fix.
sql/sql_update.cc@stripped, 2007-02-13 13:15:19-08:00, igor@stripped +1 -1
Post-merge fix.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: igor
# Host: olga.mysql.com
# Root: /home/igor/mysql-5.1-opt
--- 1.476/sql/mysql_priv.h 2007-02-13 13:15:31 -08:00
+++ 1.477/sql/mysql_priv.h 2007-02-13 13:15:31 -08:00
@@ -828,7 +828,7 @@
char* packet, uint packet_length);
void log_slow_statement(THD *thd);
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,
const char *table_name);
--- 1.261/sql/opt_range.cc 2007-02-13 13:15:31 -08:00
+++ 1.262/sql/opt_range.cc 2007-02-13 13:15:31 -08:00
@@ -10173,7 +10173,7 @@
DBUG_ENTER("QUICK_GROUP_MIN_MAX_SELECT::reset");
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);
if (quick_prefix_select && quick_prefix_select->reset())
DBUG_RETURN(1);
--- 1.245/sql/sql_insert.cc 2007-02-13 13:15:31 -08:00
+++ 1.246/sql/sql_insert.cc 2007-02-13 13:15:31 -08:00
@@ -1208,8 +1208,8 @@
}
goto err;
}
- if ((table->file->table_flags() & HA_PARTIAL_COLUMN_READ) ||
- compare_record(table, query_id))
+ if ((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) ||
+ compare_record(table))
{
info->updated++;
/*
--- 1.223/sql/sql_update.cc 2007-02-13 13:15:31 -08:00
+++ 1.224/sql/sql_update.cc 2007-02-13 13:15:31 -08:00
@@ -26,7 +26,7 @@
/* 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)
return cmp_record(table,record[1]);
--- 1.202/mysql-test/r/view.result 2007-02-13 13:15:31 -08:00
+++ 1.203/mysql-test/r/view.result 2007-02-13 13:15:31 -08:00
@@ -3079,8 +3079,8 @@
1 3
2 3
explain extended select * from v1;
-id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ALL NULL NULL NULL NULL 6 Using filesort
+id select_type table type possible_keys key key_len ref rows filtered Extra
+1 SIMPLE t1 ALL NULL NULL NULL NULL 6 100.00 Using filesort
Warnings:
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;
@@ -3092,8 +3092,8 @@
2 2
2 3
explain extended select * from v1 order by f1;
-id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ALL NULL NULL NULL NULL 6 Using filesort
+id select_type table type possible_keys key key_len ref rows filtered Extra
+1 SIMPLE t1 ALL NULL NULL NULL NULL 6 100.00 Using filesort
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`
drop view v1;
--- 1.182/mysql-test/t/view.test 2007-02-13 13:15:31 -08:00
+++ 1.183/mysql-test/t/view.test 2007-02-13 13:15:31 -08:00
@@ -748,12 +748,12 @@
#
# VIEWs with national characters
#
-create table tü (cü char);
-create view vü as select cü from tü;
-insert into vü values ('ü');
-select * from vü;
-drop view vü;
-drop table tü;
#
# problem with used_tables() of outer reference resolved in VIEW
@@ -2951,7 +2951,7 @@
#
# BUG#24293: '\Z' token is not handled correctly in views
#
-
+
--disable_warnings
DROP VIEW IF EXISTS v1;
--enable_warnings
@@ -3016,6 +3016,7 @@
drop table t1;
--echo End of 5.0 tests.
+
# 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);
--- 1.146/mysql-test/r/information_schema.result 2007-02-13 13:15:31 -08:00
+++ 1.147/mysql-test/r/information_schema.result 2007-02-13 13:15:31 -08:00
@@ -1377,10 +1377,21 @@
COLLATION_CHARACTER_SET_APPLICABILITY information_schema.COLLATION_CHARACTER_SET_APPLICABILITY 1
COLUMNS information_schema.COLUMNS 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
+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
SCHEMATA information_schema.SCHEMATA 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
TABLES information_schema.TABLES 1
TABLE_CONSTRAINTS information_schema.TABLE_CONSTRAINTS 1
--- 1.45/mysql-test/r/insert_select.result 2007-02-13 13:15:31 -08:00
+++ 1.46/mysql-test/r/insert_select.result 2007-02-13 13:15:31 -08:00
@@ -717,17 +717,3 @@
f1 f2
1 2
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;
--- 1.31/mysql-test/r/update.result 2007-02-13 13:15:31 -08:00
+++ 1.32/mysql-test/r/update.result 2007-02-13 13:15:31 -08:00
@@ -414,7 +414,7 @@
Handler_read_next 0
Handler_read_prev 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;
show status like '%Handler_read%';
Variable_name Value
@@ -423,7 +423,7 @@
Handler_read_next 0
Handler_read_prev 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;
show status like '%Handler_read%';
Variable_name Value
@@ -432,5 +432,5 @@
Handler_read_next 0
Handler_read_prev 0
Handler_read_rnd 0
-Handler_read_rnd_next 21
+Handler_read_rnd_next 0
DROP TABLE t1;
--- 1.36/mysql-test/t/insert_select.test 2007-02-13 13:15:31 -08:00
+++ 1.37/mysql-test/t/insert_select.test 2007-02-13 13:15:31 -08:00
@@ -279,16 +279,3 @@
--disable_info
select * from 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;
| Thread |
|---|
| • bk commit into 5.1 tree (igor:1.2435) | igor | 13 Feb |
