diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-07-30 16:11:39 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-07-30 16:11:39 -0300 |
| commit | c8e67f4a3f427c108de09de4608f518ebc840062 (patch) | |
| tree | a8432f344b28ba306ae10196ebcd8e9fa292ed42 /sql/mysqld.cc | |
| parent | 9ceb829c8ca24c9e0e56526cc47c924b269cf26e (diff) | |
| parent | e265609834a78a89da7101a73d29e5099b7e8ef6 (diff) | |
| download | mariadb-git-c8e67f4a3f427c108de09de4608f518ebc840062.tar.gz | |
Manual merge.
Diffstat (limited to 'sql/mysqld.cc')
| -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 d76a897519c..3a3e7e6d348 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6641,7 +6641,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.", (uchar**) &global_system_variables.max_join_size, (uchar**) &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.", (uchar**) &global_system_variables.max_length_for_sort_data, |