diff options
| author | unknown <pem@mysql.com> | 2003-12-19 20:13:48 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-12-19 20:13:48 +0100 |
| commit | 24e886a3fb812d1ef86bb90bd288f951603929a0 (patch) | |
| tree | 73743d8dde65062bfe86e66e9d220a27139cfede /sql/item_create.cc | |
| parent | bc3b221b161d8c021b3d914492f4b8647b94e2ab (diff) | |
| parent | 8d987f9e532689545becf521aa6a6aa6b23bf330 (diff) | |
| download | mariadb-git-24e886a3fb812d1ef86bb90bd288f951603929a0.tar.gz | |
Merging lex-pointer change from 4.1 to 5.0.
libmysqld/lib_sql.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/protocol.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_error.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 7a548962cde..a5b4a8904f1 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -76,7 +76,7 @@ Item *create_func_ceiling(Item* a) Item *create_func_connection_id(void) { THD *thd=current_thd; - thd->lex->safe_to_cache_query=0; + thd->lex->safe_to_cache_query= 0; return new Item_int(NullS,(longlong) ((thd->slave_thread) ? thd->variables.pseudo_thread_id : @@ -148,7 +148,7 @@ Item *create_func_floor(Item* a) Item *create_func_found_rows(void) { THD *thd=current_thd; - thd->lex->safe_to_cache_query=0; + thd->lex->safe_to_cache_query= 0; return new Item_int(NullS,(longlong) thd->found_rows(),21); } |