database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-10 04:22:00 +03:00
Code Activity

fix of BUG#11111 fix

Browse Source 
sql/item.h:
  revrited as recursive
sql/sql_select.cc:
  real_type is virtual
tests/mysql_client_test.c:
  check results abd delete views
This commit is contained in:
unknown
2005-06-15 01:57:25 +03:00
parent 10061029bc
commit 4d8cbb0c27
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/item.h
View File

@ -1352,12 +1352,9 @@ public:
{ {
(*ref)->save_in_field(result_field, no_conversions); (*ref)->save_in_field(result_field, no_conversions);
} }
Item *real_item() { Item *real_item()
Item *item= this; {
do return (*ref)->real_item();
item= *((Item_ref *)item)->ref;
while (item->type() == Item::REF_ITEM);
return item;
} }
bool walk(Item_processor processor, byte *arg) bool walk(Item_processor processor, byte *arg)
{ return (*ref)->walk(processor, arg); } { return (*ref)->walk(processor, arg); }

2
sql/sql_select.cc
View File

@ -7958,7 +7958,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
convert_blob_length); convert_blob_length);
} }
case Item::REF_ITEM: case Item::REF_ITEM:
if ( ((Item_ref*)item)->real_item()->type() == Item::FIELD_ITEM) if ( item->real_item()->type() == Item::FIELD_ITEM)
{ {
Item_field *field= (Item_field*) *((Item_ref*)item)->ref; Item_field *field= (Item_field*) *((Item_ref*)item)->ref;
Field *new_field= create_tmp_field_from_field(thd, Field *new_field= create_tmp_field_from_field(thd,

32
tests/mysql_client_test.c
View File

@ -13156,14 +13156,24 @@ static void test_bug11111()
char buf[2][20]; char buf[2][20];
long len[2]; long len[2];
int i; int i;
int rc;
const char * query = "SELECT DISTINCT f1,ff2 FROM v1"; const char * query = "SELECT DISTINCT f1,ff2 FROM v1";
myheader("test_bug11111");
mysql_query(mysql, "drop table if exists t1, t2, v1"); rc= mysql_query(mysql, "drop table if exists t1, t2, v1");
mysql_query(mysql, "create table t1 (f1 int, f2 int)"); myquery(rc);
mysql_query(mysql, "create table t2 (ff1 int, ff2 int)"); rc= mysql_query(mysql, "drop view if exists t1, t2, v1");
mysql_query(mysql, "create view v1 as select * from t1, t2 where f1=ff1"); myquery(rc);
mysql_query(mysql, "insert into t1 values (1,1), (2,2), (3,3)"); rc= mysql_query(mysql, "create table t1 (f1 int, f2 int)");
mysql_query(mysql, "insert into t2 values (1,1), (2,2), (3,3)"); myquery(rc);
rc= mysql_query(mysql, "create table t2 (ff1 int, ff2 int)");
myquery(rc);
rc= mysql_query(mysql, "create view v1 as select * from t1, t2 where f1=ff1");
myquery(rc);
rc= mysql_query(mysql, "insert into t1 values (1,1), (2,2), (3,3)");
myquery(rc);
rc= mysql_query(mysql, "insert into t2 values (1,1), (2,2), (3,3)");
myquery(rc);
stmt = mysql_stmt_init(mysql); stmt = mysql_stmt_init(mysql);
@ -13176,15 +13186,19 @@ static void test_bug11111()
bind[i].buffer= (gptr *)&buf[i]; bind[i].buffer= (gptr *)&buf[i];
bind[i].buffer_length= 20; bind[i].buffer_length= 20;
bind[i].length= &len[i]; bind[i].length= &len[i];
} }
if (mysql_stmt_bind_result(stmt, bind)) if (mysql_stmt_bind_result(stmt, bind))
printf("Error: %s\n", mysql_stmt_error(stmt)); printf("Error: %s\n", mysql_stmt_error(stmt));
mysql_stmt_fetch(stmt); mysql_stmt_fetch(stmt);
DIE_UNLESS(!strcmp(buf[1],"1")); printf("return: %s", buf[1]);
DIE_UNLESS(!strcmp(buf[1],"1"));
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
mysql_query(mysql, "drop table t1, t2, v1"); rc= mysql_query(mysql, "drop view v1");
myquery(rc);
rc= mysql_query(mysql, "drop table t1, t2");
myquery(rc);
} }
/* /*