diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2013-05-28 19:42:08 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2013-05-28 19:42:08 +0000 |
| commit | ad2e63d56dca89b9b199745d96bf3e6f69763f6d (patch) | |
| tree | 98b5f6f2baeb3e054e936bd0ebf36c1422d61f79 | |
| parent | Fix whitespace so patch applies. (diff) | |
| download | mysql-extras-ad2e63d56dca89b9b199745d96bf3e6f69763f6d.tar.gz mysql-extras-ad2e63d56dca89b9b199745d96bf3e6f69763f6d.tar.bz2 mysql-extras-ad2e63d56dca89b9b199745d96bf3e6f69763f6d.zip | |
Isn't tweak patches by hand fun?
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
| -rw-r--r-- | 07110_all_mysql_gcc-4.2_5.1.69.patch | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/07110_all_mysql_gcc-4.2_5.1.69.patch b/07110_all_mysql_gcc-4.2_5.1.69.patch index e897fd5..3d0a742 100644 --- a/07110_all_mysql_gcc-4.2_5.1.69.patch +++ b/07110_all_mysql_gcc-4.2_5.1.69.patch @@ -1260,13 +1260,12 @@ diff -ur mysql-orig/sql/item_func.cc mysql/sql/item_func.cc diff -ur mysql-orig/sql/item_func.h mysql/sql/item_func.h --- mysql-orig/sql/item_func.h 2012-08-14 01:12:29.423437567 +0000 +++ mysql/sql/item_func.h 2012-08-14 01:14:59.402197785 +0000 -@@ -421,7 +421,7 @@ +@@ -421,6 +421,6 @@ const char *func_name() const { return "cast_as_unsigned"; } void fix_length_and_dec() { - max_length= min(args[0]->max_length,MY_INT64_NUM_DECIMAL_DIGITS); + max_length= MYSQL_MIN(args[0]->max_length,MY_INT64_NUM_DECIMAL_DIGITS); - unsigned_flag=1; } longlong val_int(); diff -ur mysql-orig/sql/item_strfunc.cc mysql/sql/item_strfunc.cc |