diff options
| author | unknown <anozdrin@mysql.com> | 2005-12-09 15:14:19 +0300 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2005-12-09 15:14:19 +0300 |
| commit | 16bca982675eae7334e3629ad5b0c786d384a272 (patch) | |
| tree | e8d8d0e4221b70994cc2102da16ba5febf0e3f48 /sql/sql_class.h | |
| parent | 2309be62e54ac54877645e0c264797646a379b32 (diff) | |
| parent | 06e996639664f2f5270793047b47830fd85edbd7 (diff) | |
| download | mariadb-git-16bca982675eae7334e3629ad5b0c786d384a272.tar.gz | |
Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984
into mysql.com:/home/alik/MySQL/devel/5.1-wl2984-merge
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
BitKeeper/deleted/.del-type_newdecimal-big.result:
Auto merged
BitKeeper/deleted/.del-type_newdecimal-big.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/field.cc:
Merge.
sql/sp_head.cc:
Merge.
sql/sql_select.cc:
Merge.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index fcc8409546f..0fd98cff878 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2111,7 +2111,7 @@ public: Routine to which this Item_splocal belongs. Used for checking if correct runtime context is used for variable handling. */ - sp_head *owner; + sp_head *sp; #endif bool local; uint offset; |