diff options
| author | hf@deer.mysql.r18.ru <> | 2003-01-20 18:59:45 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2003-01-20 18:59:45 +0400 |
| commit | 389680e04e059cf78d3d7c929cb35c20064381fa (patch) | |
| tree | 26bff9a8e2da794ce9796009e2fbd0d050252445 /sql/item_func.cc | |
| parent | 1f6b6156773ae42f45cb2552cecbf52ef6964e23 (diff) | |
| parent | d14db3961d7f6839dd211ed3c136ddd8c709778c (diff) | |
| download | mariadb-git-389680e04e059cf78d3d7c929cb35c20064381fa.tar.gz | |
Conflicts resolving
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 47d26169d06..a5d45d42635 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -394,7 +394,7 @@ void Item_func_minus::fix_length_and_dec() { Item_num_op::fix_length_and_dec(); if (unsigned_flag && - (current_thd->sql_mode & MODE_NO_UNSIGNED_SUBTRACTION)) + (current_thd->variables.sql_mode & MODE_NO_UNSIGNED_SUBTRACTION)) unsigned_flag=0; } |