| List: | Internals | « Previous MessageNext Message » | |
| From: | igor | Date: | June 17 2005 9:23pm |
| Subject: | bk commit into 4.1 tree (igor:1.2300) BUG#10124 | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 4.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 1.2300 05/06/17 12:23:50 igor@stripped +6 -0 sql_select.h, sql_select.cc, item_subselect.cc: Fixed bug #10124. The copy method of the store_key classes can return STORE_KEY_OK=0, STORE_KEY_FATAL=1, STORE_KEY_CONV=2 now. field.cc: Fixed bug #10124. When ussuing a warning the store methods return 2 instead of 1 now. func_str.result, func_str.test: Added a test case for bug #10124. sql/sql_select.h 1.76 05/06/17 11:54:59 igor@stripped +16 -9 Fixed bug #10124. The copy method of the store_key classes can return STORE_KEY_OK=0, STORE_KEY_FATAL=1, STORE_KEY_CONV=2 now. sql/sql_select.cc 1.413 05/06/17 11:53:51 igor@stripped +6 -2 Fixed bug #10124. The copy method of the store_key classes can return STORE_KEY_OK=0, STORE_KEY_FATAL=1, STORE_KEY_CONV=2 now. sql/item_subselect.cc 1.137 05/06/17 11:51:24 igor@stripped +2 -2 Fixed bug #10124. The copy method of the store_key classes can return STORE_KEY_OK=0, STORE_KEY_FATAL=1, STORE_KEY_CONV=2 now. sql/field.cc 1.221 05/06/17 11:47:57 igor@stripped +59 -59 Fixed bug #10124. When ussuing a warning the store methods return 2 instead of 1 now. mysql-test/r/func_str.result 1.92 05/06/17 11:46:55 igor@stripped +11 -0 Added a test case for bug #10124. mysql-test/t/func_str.test 1.73 05/06/17 11:46:25 igor@stripped +14 -0 Added a test case for bug #10124. # 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: rurik.mysql.com # Root: /home/igor/dev/mysql-4.1-0 --- 1.220/sql/field.cc Sun Jun 5 10:38:38 2005 +++ 1.221/sql/field.cc Fri Jun 17 11:47:57 2005 @@ -2463,7 +2463,7 @@ { tmp=0; // Set negative to 0 my_errno=ERANGE; - error= 1; + error= 2; } else tmp=(long) my_strntoul(cs,from,len,10,&end,&error); @@ -2473,14 +2473,14 @@ if (error || (from+len != end && table->in_use->count_cuted_fields && !test_if_int(from,len,end,cs))) - error= 1; + error= 2; #if SIZEOF_LONG > 4 if (unsigned_flag) { if ((ulong) tmp > UINT_MAX32) { tmp= UINT_MAX32; - error= 1; + error= 2; my_errno=ERANGE; } } @@ -2489,13 +2489,13 @@ if (tmp > INT_MAX32) { tmp= INT_MAX32; - error= 1; + error= 2; my_errno=ERANGE; } else if (tmp < INT_MIN32) { tmp= INT_MIN32; - error= 1; + error= 2; my_errno=ERANGE; } } @@ -2503,7 +2503,7 @@ if (error) { set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1); - error= 1; + error= 2; } #ifdef WORDS_BIGENDIAN if (table->db_low_byte_first) @@ -2528,13 +2528,13 @@ { res=0; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else if (nr > (double) UINT_MAX32) { res= UINT_MAX32; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else res=(int32) (ulong) nr; @@ -2545,13 +2545,13 @@ { res=(int32) INT_MIN32; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else if (nr > (double) INT_MAX32) { res=(int32) INT_MAX32; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else res=(int32) nr; @@ -2586,13 +2586,13 @@ { res=0; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else if (nr >= (LL(1) << 32)) { res=(int32) (uint32) ~0L; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else res=(int32) (uint32) nr; @@ -2603,13 +2603,13 @@ { res=(int32) INT_MIN32; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else if (nr > (longlong) INT_MAX32) { res=(int32) INT_MAX32; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else res=(int32) nr; @@ -2759,7 +2759,7 @@ { tmp=0; // Set negative to 0 my_errno= ERANGE; - error= 1; + error= 2; } else tmp=(longlong) my_strntoull(cs,from,len,10,&end,&error); @@ -2771,7 +2771,7 @@ !test_if_int(from,len,end,cs))) { set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1); - error= 1; + error= 2; } #ifdef WORDS_BIGENDIAN if (table->db_low_byte_first) @@ -2796,13 +2796,13 @@ { res=0; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else if (nr >= (double) ~ (ulonglong) 0) { res= ~(longlong) 0; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else res=(longlong) (ulonglong) nr; @@ -2813,13 +2813,13 @@ { res=(longlong) LONGLONG_MIN; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else if (nr >= (double) (ulonglong) LONGLONG_MAX) { res=(longlong) LONGLONG_MAX; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else res=(longlong) nr; @@ -2991,7 +2991,7 @@ double nr= my_strntod(cs,(char*) from,len,&end,&error); if (error || ((uint) (end-from) != len && table->in_use->count_cuted_fields)) { - error= 1; + error= 2; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1); } Field_float::store(nr); @@ -3009,13 +3009,13 @@ j= 0; set_null(); set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else if (unsigned_flag && nr < 0) { j= 0; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else { @@ -3277,7 +3277,7 @@ double nr= my_strntod(cs,(char*) from, len, &end, &error); if (error || ((uint) (end-from) != len && table->in_use->count_cuted_fields)) { - error= 1; + error= 2; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1); } Field_double::store(nr); @@ -3294,13 +3294,13 @@ nr= 0; set_null(); set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else if (unsigned_flag && nr < 0) { nr= 0; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else { @@ -3320,13 +3320,13 @@ { nr= -max_value; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } else if (nr > max_value) { nr= max_value; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - error= 1; + error= 2; } } @@ -3649,14 +3649,14 @@ ER_WARN_DATA_OUT_OF_RANGE, from, len, MYSQL_TIMESTAMP_DATETIME, !error); - error= 1; + error= 2; } else if (in_dst_time_gap) { set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_INVALID_TIMESTAMP, from, len, MYSQL_TIMESTAMP_DATETIME, !error); - error= 1; + error= 2; } } @@ -3680,7 +3680,7 @@ ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_DATETIME); nr= 0; // Avoid overflow on buff - error= 1; + error= 2; } error|= Field_timestamp::store((longlong) rint(nr)); return error; @@ -3702,7 +3702,7 @@ set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_DATETIME, 1); - error= 1; + error= 2; } if (in_dst_time_gap) @@ -3710,7 +3710,7 @@ set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_INVALID_TIMESTAMP, nr, MYSQL_TIMESTAMP_DATETIME, !error); - error= 1; + error= 2; } } else if (error) @@ -3947,7 +3947,7 @@ if (str_to_time(from, len, <ime, &error)) { tmp=0L; - error= 1; + error= 2; set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, from, len, MYSQL_TIMESTAMP_TIME, 1); } @@ -3967,7 +3967,7 @@ set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, from, len, MYSQL_TIMESTAMP_TIME, !error); - error= 1; + error= 2; } } @@ -3987,14 +3987,14 @@ tmp=8385959L; set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_TIME); - error= 1; + error= 2; } else if (nr < -8385959.0) { tmp= -8385959L; set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_TIME); - error= 1; + error= 2; } else { @@ -4007,7 +4007,7 @@ set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_TIME); - error= 1; + error= 2; } } int3store(ptr,tmp); @@ -4025,7 +4025,7 @@ set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_TIME, 1); - error= 1; + error= 2; } else if (nr < (longlong) -8385959L) { @@ -4033,7 +4033,7 @@ set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_TIME, 1); - error= 1; + error= 2; } else { @@ -4044,7 +4044,7 @@ set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_TIME, 1); - error= 1; + error= 2; } } int3store(ptr,tmp); @@ -4197,7 +4197,7 @@ { *ptr=0; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - return 1; + return 2; } if (table->in_use->count_cuted_fields && !test_if_int(from,len,end,cs)) set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1); @@ -4230,7 +4230,7 @@ { *ptr=0; set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1); - return 1; + return 2; } if (nr != 0 || field_length != 4) // 0000 -> 0; 00 -> 2000 { @@ -4298,7 +4298,7 @@ if (str_to_datetime(from, len, &l_time, 1, &error) <= MYSQL_TIMESTAMP_ERROR) { tmp=0; - error= 1; + error= 2; } else tmp=(uint32) l_time.year*10000L + (uint32) (l_time.month*100+l_time.day); @@ -4331,7 +4331,7 @@ set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_DATE); - error= 1; + error= 2; } else tmp=(long) rint(nr); @@ -4359,7 +4359,7 @@ set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_DATE, 0); - error= 1; + error= 2; } else tmp=(long) nr; @@ -4489,7 +4489,7 @@ if (str_to_datetime(from, len, &l_time, 1, &error) <= MYSQL_TIMESTAMP_ERROR) { tmp=0L; - error= 1; + error= 2; } else tmp= l_time.day + l_time.month*32 + l_time.year*16*32; @@ -4509,7 +4509,7 @@ (void) Field_newdate::store((longlong) -1); set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, nr, MYSQL_TIMESTAMP_DATE); - return 1; + return 2; } else return Field_newdate::store((longlong) rint(nr)); @@ -4528,7 +4528,7 @@ set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_DATE, 1); - error= 1; + error= 2; } else { @@ -4548,7 +4548,7 @@ set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_DATE, 1); - error= 1; + error= 2; } else tmp= day + month*32 + (tmp/10000)*16*32; @@ -4697,7 +4697,7 @@ ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_DATETIME); nr=0.0; - error= 1; + error= 2; } error |= Field_datetime::store((longlong) rint(nr)); return error; @@ -4931,7 +4931,7 @@ from= tmpstr.ptr(); length= tmpstr.length(); if (conv_errors) - error= 1; + error= 2; } /* @@ -4955,7 +4955,7 @@ from+= field_charset->cset->scan(field_charset, from, end, MY_SEQ_SPACES); if (from != end) - error= 1; + error= 2; } if (error) set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1); @@ -5210,12 +5210,12 @@ from= tmpstr.ptr(); length= tmpstr.length(); if (conv_errors) - error= 1; + error= 2; } if (length > field_length) { length=field_length; - error= 1; + error= 2; } if (error) set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1); @@ -5568,7 +5568,7 @@ from= tmpstr.ptr(); length= tmpstr.length(); if (conv_errors) - error= 1; + error= 2; } copy_length= max_data_length(); @@ -5583,7 +5583,7 @@ copy_length, &well_formed_error); if (copy_length < length) - error= 1; + error= 2; Field_blob::store_length(copy_length); if (was_conversion || table->copy_blobs || copy_length <= MAX_FIELD_WIDTH) { // Must make a copy @@ -6218,7 +6218,7 @@ { set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1); nr=0; - error=1; + error=2; } store_type((ulonglong) (uint) nr); return error; @@ -6393,7 +6393,7 @@ { nr&= (longlong) (((longlong) 1 << typelib->count) - (longlong) 1); set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1); - error=1; + error=2; } store_type((ulonglong) nr); return error; --- 1.412/sql/sql_select.cc Thu Jun 16 09:43:51 2005 +++ 1.413/sql/sql_select.cc Fri Jun 17 11:53:51 2005 @@ -8218,14 +8218,18 @@ bool cp_buffer_from_ref(THD *thd, TABLE_REF *ref) { + enum enum_check_fields save_count_cuted_fields= thd->count_cuted_fields; thd->count_cuted_fields= CHECK_FIELD_IGNORE; for (store_key **copy=ref->key_copy ; *copy ; copy++) - if ((*copy)->copy()) + { + enum store_key::store_key_result res; + if ((res= (*copy)->copy())) { thd->count_cuted_fields= save_count_cuted_fields; - return 1; // Something went wrong + return (res & 1); // Something went wrong } + } thd->count_cuted_fields= save_count_cuted_fields; return 0; } --- 1.75/sql/sql_select.h Wed May 4 06:05:53 2005 +++ 1.76/sql/sql_select.h Fri Jun 17 11:54:59 2005 @@ -356,6 +356,7 @@ char *null_ptr; char err; public: + enum store_key_result { STORE_KEY_OK, STORE_KEY_FATAL, STORE_KEY_CONV }; store_key(THD *thd, Field *field_arg, char *ptr, char *null, uint length) :null_ptr(null),err(0) { @@ -371,7 +372,7 @@ } } virtual ~store_key() {} /* Not actually needed */ - virtual bool copy()=0; + virtual enum store_key_result copy()=0; virtual const char *name() const=0; }; @@ -392,10 +393,10 @@ copy_field.set(to_field,from_field,0); } } - bool copy() + enum store_key_result copy() { copy_field.do_copy(©_field); - return err != 0; + return err != 0 ? STORE_KEY_FATAL : STORE_KEY_OK; } const char *name() const { return field_name; } }; @@ -412,9 +413,11 @@ null_ptr_arg ? null_ptr_arg : item_arg->maybe_null ? &err : NullS, length), item(item_arg) {} - bool copy() + enum store_key_result copy() { - return item->save_in_field(to_field, 1) || err != 0; + int res= item->save_in_field(to_field, 1); + return (err != 0 || res > 2 ? STORE_KEY_FATAL : (store_key_result) res); + } const char *name() const { return "func"; } }; @@ -432,15 +435,19 @@ &err : NullS, length, item_arg), inited(0) { } - bool copy() + enum store_key_result copy() { + int res; if (!inited) { inited=1; - if (item->save_in_field(to_field, 1)) - err= 1; + if ((res= item->save_in_field(to_field, 1))) + { + if (err == 0) + err= res; + } } - return err != 0; + return (err > 2 ? STORE_KEY_FATAL : (store_key_result) err); } const char *name() const { return "const"; } }; --- 1.136/sql/item_subselect.cc Sun Jun 5 10:38:40 2005 +++ 1.137/sql/item_subselect.cc Fri Jun 17 11:51:24 2005 @@ -1361,7 +1361,7 @@ TABLE *table= tab->table; for (store_key **copy=tab->ref.key_copy ; *copy ; copy++) { - if (tab->ref.key_err= (*copy)->copy()) + if ((tab->ref.key_err= (*copy)->copy()) & 1) { table->status= STATUS_NOT_FOUND; DBUG_RETURN(1); @@ -1414,7 +1414,7 @@ for (store_key **copy=tab->ref.key_copy ; *copy ; copy++) { - if (tab->ref.key_err= (*copy)->copy()) + if ((tab->ref.key_err= (*copy)->copy()) & 1) { table->status= STATUS_NOT_FOUND; DBUG_RETURN(1); --- 1.91/mysql-test/r/func_str.result Wed Jun 1 09:48:22 2005 +++ 1.92/mysql-test/r/func_str.result Fri Jun 17 11:46:55 2005 @@ -789,3 +789,14 @@ select field(NULL,1,2,NULL), field(NULL,1,2,0); field(NULL,1,2,NULL) field(NULL,1,2,0) 0 0 +CREATE TABLE t1 (str varchar(20) PRIMARY KEY); +CREATE TABLE t2 (num int primary key); +INSERT INTO t1 VALUES ('notnumber'); +INSERT INTO t2 VALUES (0), (1); +SELECT * FROM t1, t2 WHERE num=str; +str num +notnumber 0 +SELECT * FROM t1, t2 WHERE num=substring(str from 1 for 6); +str num +notnumber 0 +DROP TABLE t1,t2; --- 1.72/mysql-test/t/func_str.test Wed Jun 1 09:48:22 2005 +++ 1.73/mysql-test/t/func_str.test Fri Jun 17 11:46:25 2005 @@ -527,3 +527,17 @@ # select field(0,NULL,1,0), field("",NULL,"bar",""), field(0.0,NULL,1.0,0.0); select field(NULL,1,2,NULL), field(NULL,1,2,0); + +# +# Bug #10124: access by integer index with a string key that is not a number +# + +CREATE TABLE t1 (str varchar(20) PRIMARY KEY); +CREATE TABLE t2 (num int primary key); +INSERT INTO t1 VALUES ('notnumber'); +INSERT INTO t2 VALUES (0), (1); + +SELECT * FROM t1, t2 WHERE num=str; +SELECT * FROM t1, t2 WHERE num=substring(str from 1 for 6); + +DROP TABLE t1,t2;
| Thread | ||
|---|---|---|
| • bk commit into 4.1 tree (igor:1.2300) BUG#10124 | igor | 17 Jun |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.477 sec. using MySQL 5.1.14-beta-log