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

Merge macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt

Browse Source 
into  macbook.gmz:/Users/kgeorge/mysql/work/B14553-5.0-opt


mysql-test/r/odbc.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/rpl_insert_id.result:
  merge the test at the end of 4.1 test
mysql-test/t/rpl_insert_id.test:
  merge the test at the end of 4.1 test
sql/sql_class.cc:
  merged
sql/sql_class.h:
  merged
This commit is contained in:
unknown 2006-07-10 16:44:05 +03:00
commit a8a6361b49
7 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,3 +14,14 @@ explain select * from t1 where b is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE
drop table t1;
CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY);
INSERT INTO t1 VALUES (NULL);
SELECT sql_no_cache a, last_insert_id() FROM t1 WHERE a IS NULL;
a last_insert_id()
1 1
SELECT sql_no_cache a, last_insert_id() FROM t1 WHERE a IS NULL;
a last_insert_id()
SELECT sql_no_cache a, last_insert_id() FROM t1;
a last_insert_id()
1 1
DROP TABLE t1;

13
mysql-test/r/rpl_insert_id.result
View File

@ -73,7 +73,20 @@ CREATE TABLE t1 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0;
INSERT INTO t1 VALUES (1),(1);
ERROR 23000: Duplicate entry '1' for key 1
drop table if exists t1, t2;
create table t1(a int auto_increment, key(a));
create table t2(a int);
insert into t1 (a) values (null);
insert into t2 (a) select a from t1 where a is null;
insert into t2 (a) select a from t1 where a is null;
select * from t2;
a
1
select * from t2;
a
1
drop table t1;
drop table t2;
drop function if exists bug15728;
drop function if exists bug15728_insert;
drop table if exists t1, t2;

10
mysql-test/t/odbc.test
View File

@ -21,4 +21,14 @@ select * from t1 where a is null;
explain select * from t1 where b is null;
drop table t1;
#
# Bug #14553: NULL in WHERE resets LAST_INSERT_ID
#
CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY);
INSERT INTO t1 VALUES (NULL);
SELECT sql_no_cache a, last_insert_id() FROM t1 WHERE a IS NULL;
SELECT sql_no_cache a, last_insert_id() FROM t1 WHERE a IS NULL;
SELECT sql_no_cache a, last_insert_id() FROM t1;
DROP TABLE t1;
# End of 4.1 tests

19
mysql-test/t/rpl_insert_id.test
View File

@ -77,6 +77,25 @@ sync_slave_with_master;
connection master;
drop table t1;
sync_slave_with_master;
#
# Bug#14553: NULL in WHERE resets LAST_INSERT_ID
#
connection master;
drop table if exists t1,t2;
create table t1(a int auto_increment, key(a));
create table t2(a int);
insert into t1 (a) values (null);
insert into t2 (a) select a from t1 where a is null;
insert into t2 (a) select a from t1 where a is null;
select * from t2;
sync_slave_with_master;
connection slave;
select * from t2;
connection master;
drop table t1;
drop table t2;
sync_slave_with_master;
# End of 4.1 tests

1
sql/sql_class.cc
View File

@ -269,6 +269,7 @@ THD::THD()
tablespace_op=FALSE;
ulong tmp=sql_rnd_with_mutex();
randominit(&rand, tmp + (ulong) &rand, tmp + (ulong) ::query_id);
substitute_null_with_insert_id = FALSE;
thr_lock_info_init(&lock_info); /* safety: will be reset after start */
thr_lock_owner_init(&main_lock_id, &lock_info);
}

3
sql/sql_class.h
View File

@ -1321,6 +1321,8 @@ public:
bool no_errors, password, is_fatal_error;
bool query_start_used, rand_used, time_zone_used;
bool last_insert_id_used,insert_id_used, clear_next_insert_id;
/* for IS NULL => = last_insert_id() fix in remove_eq_conds() */
bool substitute_null_with_insert_id;
bool in_lock_tables;
bool query_error, bootstrap, cleanup_done;
bool tmp_table_used;
@ -1452,6 +1454,7 @@ public:
{
last_insert_id= id_arg;
insert_id_used=1;
substitute_null_with_insert_id= TRUE;
}
inline ulonglong insert_id(void)
{

4
sql/sql_select.cc
View File

@ -7854,7 +7854,7 @@ remove_eq_conds(THD *thd, COND *cond, Item::cond_result *cond_value)
Field *field=((Item_field*) args[0])->field;
if (field->flags & AUTO_INCREMENT_FLAG && !field->table->maybe_null &&
(thd->options & OPTION_AUTO_IS_NULL) &&
thd->insert_id())
thd->insert_id() && thd->substitute_null_with_insert_id)
{
#ifdef HAVE_QUERY_CACHE
query_cache_abort(&thd->net);
@ -7873,7 +7873,7 @@ remove_eq_conds(THD *thd, COND *cond, Item::cond_result *cond_value)
*/
cond->fix_fields(thd, &cond);
}
thd->insert_id(0); // Clear for next request
thd->substitute_null_with_insert_id= FALSE; // Clear for next request
}
/* fix to replace 'NULL' dates with '0' (shreeve@uci.edu) */
else if (((field->type() == FIELD_TYPE_DATE) ||