database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge rakia:mysql/4.1/B14553

Browse Source 
into  macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt
This commit is contained in:
gkodinov/kgeorge@macbook.gmz
2006-07-10 16:27:04 +03:00
parent 6e1c8ad830 2c9f5cc706
commit 893e92761f
7 changed files with 60 additions and 3 deletions
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 id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
drop table t1; 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;

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

@@ -73,3 +73,17 @@ CREATE TABLE t1 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0; SET FOREIGN_KEY_CHECKS=0;
INSERT INTO t1 VALUES (1),(1); INSERT INTO t1 VALUES (1),(1);
ERROR 23000: Duplicate entry '1' for key 1 ERROR 23000: Duplicate entry '1' for key 1
drop table t1;
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;

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; explain select * from t1 where b is null;
drop table t1; 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 # End of 4.1 tests

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

@@ -74,4 +74,22 @@ SET FOREIGN_KEY_CHECKS=0;
INSERT INTO t1 VALUES (1),(1); INSERT INTO t1 VALUES (1),(1);
sync_slave_with_master; sync_slave_with_master;
#
# Bug#14553: NULL in WHERE resets LAST_INSERT_ID
#
connection master;
drop table t1;
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 # End of 4.1 tests

1
sql/sql_class.cc
View File

@@ -265,6 +265,7 @@ THD::THD()
ulong tmp=sql_rnd_with_mutex(); ulong tmp=sql_rnd_with_mutex();
randominit(&rand, tmp + (ulong) &rand, tmp + (ulong) ::query_id); randominit(&rand, tmp + (ulong) &rand, tmp + (ulong) ::query_id);
} }
substitute_null_with_insert_id = FALSE;
} }

3
sql/sql_class.h
View File

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

4
sql/sql_select.cc
View File

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