diff options
| author | Matthias Leich <Matthias.Leich@sun.com> | 2009-07-30 21:38:17 +0200 |
|---|---|---|
| committer | Matthias Leich <Matthias.Leich@sun.com> | 2009-07-30 21:38:17 +0200 |
| commit | 7fc27f3dd5e4c1b30dcf6d725b8f2b037cfbbb2b (patch) | |
| tree | 7a2b34b155a8c4c73232b631222438b01edc0b2e | |
| parent | 79751dff10b7c9b3909e77c89626b7e241752f3e (diff) | |
| parent | e265609834a78a89da7101a73d29e5099b7e8ef6 (diff) | |
| download | mariadb-git-7fc27f3dd5e4c1b30dcf6d725b8f2b037cfbbb2b.tar.gz | |
Merge latest changes into local tree, no conflicts
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 753c2318ac2..ec08edbc265 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6171,7 +6171,7 @@ The minimum value for this variable is 4096.", "Joins that are probably going to read more than max_join_size records return an error.", (gptr*) &global_system_variables.max_join_size, (gptr*) &max_system_variables.max_join_size, 0, GET_HA_ROWS, REQUIRED_ARG, - ~0L, 1, ~0L, 0, 1, 0}, + HA_POS_ERROR, 1, HA_POS_ERROR, 0, 1, 0}, {"max_length_for_sort_data", OPT_MAX_LENGTH_FOR_SORT_DATA, "Max number of bytes in sorted records.", (gptr*) &global_system_variables.max_length_for_sort_data, |