Merge mysql.com:/home/psergey/mysql-5.0-latest-pull

into mysql.com:/dbdata/psergey/mysql-5.0-imerge-unique


BitKeeper/etc/logging_ok:
  auto-union
include/my_global.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/uniques.cc:
  Auto merged

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/item_create.cc b/sql/item_create.cc
index aa64cf52017..cccbf6e4226 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -72,7 +72,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 :
@@ -144,7 +144,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);
 }