diff options
| author | unknown <joerg@mysql.com> | 2005-05-26 18:12:56 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-05-26 18:12:56 +0200 |
| commit | e3beea23a0f202866c293947a74fc6df092e5763 (patch) | |
| tree | 56393e9df08f316d03246dd2022515284aa290c8 /sql | |
| parent | d4be3ae2a3ae1e89756763655044d41bd702cd44 (diff) | |
| parent | df16d85926c6cdfe9b59bdf7b7b56e4f343ddec4 (diff) | |
| download | mariadb-git-e3beea23a0f202866c293947a74fc6df092e5763.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
sql/item.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.cc | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 182aef4c94c..77ea7b85ab0 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -3700,6 +3700,7 @@ Item_hex_string::Item_hex_string(const char *str, uint str_length) *ptr=0; // Keep purify happy collation.set(&my_charset_bin, DERIVATION_COERCIBLE); fixed= 1; + unsigned_flag= 1; } longlong Item_hex_string::val_int() diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0553584b277..6b9676c8124 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3972,7 +3972,7 @@ select_part2: select_into select_lock_type; select_into: - opt_limit_clause {} + opt_order_clause opt_limit_clause {} | into | select_from | into select_from |