diff options
| author |   Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2011-07-21 02:26:57 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2011-07-21 02:26:57 +0000 |
| commit | bf8c2e431145855eb3dd7de9fc683b46c9f9b8ed (patch) | |
| tree | b42cdfb40a21de3442b2ee8420493e1052613ddf | |
| parent | Update 07110_all_mysql_gcc-4.2_5.1.58.patch. (diff) | |
| download | mysql-extras-20110721-0450Z.tar.gz mysql-extras-20110721-0450Z.tar.bz2 mysql-extras-20110721-0450Z.zip | |
Fix broken s/max/MYSQL_MAX/ replacements on 07110_all_mysql_gcc-4.2_5.1.58.patch.mysql-extras-20110721-0450Zmysql-extras-20110721-0446Z
| -rw-r--r-- | 07110_all_mysql_gcc-4.2_5.1.58.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/07110_all_mysql_gcc-4.2_5.1.58.patch b/07110_all_mysql_gcc-4.2_5.1.58.patch index 659728c..a4f56e2 100644 --- a/07110_all_mysql_gcc-4.2_5.1.58.patch +++ b/07110_all_mysql_gcc-4.2_5.1.58.patch @@ -2942,7 +2942,7 @@ diff -urN mysql-orig/storage/myisam/mi_check.c mysql/storage/myisam/mi_check.c */ sort_info.max_records= 10 * - max(param->sort_buffer_length, MIN_SORT_BUFFER) / -+ MYSQL_MAXparam->sort_buffer_length, MIN_SORT_BUFFER) / ++ MYSQL_MAX(param->sort_buffer_length, MIN_SORT_BUFFER) / sort_param.key_length; } @@ -2960,7 +2960,7 @@ diff -urN mysql-orig/storage/myisam/mi_check.c mysql/storage/myisam/mi_check.c /* 32 is just a safety margin here - (at least max(val_len, sizeof(nod_flag)) should be there). -+ (at least MYSQL_MAXval_len, sizeof(nod_flag)) should be there). ++ (at least MYSQL_MAX(val_len, sizeof(nod_flag)) should be there). May be better performance could be achieved if we'd put (sort_info->keyinfo->block_length-32)/XXX instead. |