after merge fix.

5c42e683 · ramil/ram@mysql.com/myoffice.izhnet.ru · e8968822 · 5c42e683 · 5c42e683
Commit 5c42e683 authored Jan 18, 2007 by ramil/ram@mysql.com/myoffice.izhnet.ru
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 365 deletions

mysql-test/r/select.result mysql-test/r/select.result +17 -363

sql/item.cc sql/item.cc +2 -2

No files found.
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -4478,10 +4478,10 @@ int Item_hex_string::save_in_field(Field *field, bool no_conversions)
    nr= LONGLONG_MAX;
    goto warn;
  }
-  return field->store((longlong) nr);
+  return field->store((longlong) nr, TRUE);  // Assume hex numbers are unsigned

 warn:
-  if (!field->store((longlong) nr))
+  if (!field->store((longlong) nr, TRUE))
    field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE,
                       1);
  return 1;