Commit graph

49955 commits

Author SHA1 Message Date
gkodinov/kgeorge@magare.gmz
5df890e524 Merge bk-internal:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31094-5.1-opt
2007-10-06 16:08:39 +03:00
gkodinov/kgeorge@magare.gmz
91455690b5 Bug #31094: Forcing index-based sort doesn't work anymore if joins are done
A rule was introduced by the 5.1 part of the fix for bug 27531 to 
prefer filesort over indexed ORDER BY when accessing all of the rows of a 
table (because it's faster). This new rule was not accounting for the 
presence of a LIMIT clause.
Fixed the condition for this rule so it will prefer filesort over 
indexed ORDER BY only if no LIMIT.
2007-10-05 17:28:34 +03:00
holyfoot/hf@hfmain.(none)
f32f9ab9f5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 18:56:37 +05:00
holyfoot/hf@hfmain.(none)
9f8842c265 Merge mysql.com:/home/hf/work/30286/my50-30286
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 16:33:37 +05:00
holyfoot/hf@hfmain.(none)
1ab2fd9bb8 Merge mysql.com:/home/hf/work/30286/my41-30286
into  mysql.com:/home/hf/work/30286/my50-30286
2007-10-05 16:33:08 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
39f6cbc221 Merge mysql.com:/home/hf/work/30955/my41-30955
into  mysql.com:/home/hf/work/30286/my41-30286
2007-10-05 16:32:05 +05:00
holyfoot/hf@hfmain.(none)
b768b1a50b Merge mysql.com:/home/hf/work/30286/my50-30286
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 15:51:27 +05:00
holyfoot/hf@hfmain.(none)
b93759b011 Merge mysql.com:/home/hf/work/30286/my41-30286
into  mysql.com:/home/hf/work/30286/my50-30286
2007-10-05 15:50:02 +05:00
holyfoot/hf@hfmain.(none)
345fb4e9f0 Merge mysql.com:/home/hf/work/30286/my41-30286
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 15:49:23 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
b95dd64d50 Merge bk@192.168.21.1:mysql-4.1-opt
into  mysql.com:/home/hf/work/30286/my41-30286
2007-10-05 15:48:42 +05:00
holyfoot/hf@hfmain.(none)
36ecbf5ff8 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/30286/my50-30286
2007-10-05 15:47:55 +05:00
holyfoot/hf@hfmain.(none)
24e84f15b6 Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 15:46:42 +05:00
holyfoot/hf@hfmain.(none)
e3b4267c12 Merge mysql.com:/home/hf/work/30286/my50-30286
into  mysql.com:/home/hf/work/30286/my51-30286
2007-10-05 15:43:15 +05:00
holyfoot/hf@hfmain.(none)
0b79b24f03 Merge mysql.com:/home/hf/work/30286/my41-30286
into  mysql.com:/home/hf/work/30286/my50-30286
2007-10-05 15:41:56 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
54b0cf97b3 Bug #30286 spatial index cause corruption and server crash!
As the result of DOUBLE claculations can be bigger
than DBL_MAX constant we use in code, we shouldn't use this constatn
as a biggest possible value.
Particularly the rtree_pick_key function set 'min_area= DBL_MAX' relying
that any rtree_area_increase result will be less so we return valid
key. Though in rtree_area_increase function we calculate the area
of the rectangle, so the result can be 'inf' if the rectangle is
huge enough, which is bigger than DBL_MAX.

Code of the rtree_pick_key modified so we always return a valid key.
2007-10-05 15:40:32 +05:00
holyfoot/hf@hfmain.(none)
e19efc0a6e Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/26527/my51-26527
2007-10-05 14:21:59 +05:00
gluh@eagle.(none)
0b2f20bb9c Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-05 12:32:29 +05:00
gluh@mysql.com/eagle.(none)
ac8559359c test fix(to satisfy WIN) 2007-10-05 12:29:02 +05:00
gluh@eagle.(none)
16c07b16fe Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-04 17:13:57 +05:00
gluh@mysql.com/eagle.(none)
ce2430bcb6 after merge fix 2007-10-04 17:08:59 +05:00
gluh@eagle.(none)
4741df1878 manual merge 2007-10-04 16:35:12 +05:00
gluh@mysql.com/eagle.(none)
d6e626a61d Bug#30079 A check for "hidden" I_S tables is flawed
added check for hidden I_S tables for 'show columns|keys' commands
2007-10-04 16:20:56 +05:00
gluh@mysql.com/eagle.(none)
e2614270c3 after merge fix 2007-10-04 15:35:45 +05:00
gluh@eagle.(none)
53fa81ac03 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-04 14:23:55 +05:00
gshchepa/uchum@gleb.loc
009d8b609e mysqldump.c:
Post-merge fix.
2007-10-03 15:49:51 +05:00
gshchepa/uchum@gleb.loc
5184ff828c Merge gleb.loc:/home/uchum/work/bk/5.0-opt-31077
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-10-03 15:05:11 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
a7a6c6eb08 Bug #30955 geomfromtext() crasher.
end-of-line check missed in Gis_read_stream::get_next_word,
what can lead to crashes (expecially with NULL strings).

End-of-line check added
2007-10-03 13:35:35 +05:00
gshchepa/uchum@gleb.loc
0918fe8320 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-31077
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-10-03 11:37:29 +05:00
gshchepa/uchum@gleb.loc
a6b5121b40 mysqldump.test, mysqldump.result:
Bug #31077: post-commit fix.
2007-10-03 11:36:42 +05:00
gshchepa/uchum@gleb.loc
8049c695c3 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-31077
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-10-03 02:51:17 +05:00
gshchepa/uchum@gleb.loc
c81751adba mysqldump.c, mysqldump.test, mysqldump.result:
Bug #31077: post-commit fix.
2007-10-03 02:50:38 +05:00
gshchepa/uchum@gleb.loc
c3ffd4ac00 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-31077
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-10-02 22:31:51 +05:00
gkodinov/kgeorge@magare.gmz
c6e974226e fixed a warning in the fix for bug 28702 2007-10-02 17:45:49 +03:00
gkodinov/kgeorge@magare.gmz
6a03980418 Merge bk-internal:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28702-vg-5.0-opt
2007-10-02 15:36:08 +03:00
gkodinov/kgeorge@magare.gmz
6c8627de49 Fixed a valgrind warning with the fix for bug 28702. 2007-10-02 15:36:07 +03:00
mhansson@dl145s.mysql.com
6e43d599a8 Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into  dl145s.mysql.com:/data0/mhansson/bug30832/my50-bug30832
2007-10-02 14:36:07 +02:00
evgen@moonbone.local
a903032574 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/work/31095-bug-5.0-opt-mysql
2007-10-02 12:36:06 +00:00
evgen@moonbone.local
49af76ac8a Bug#31095: Unexpected NULL constant caused server crash.
The Item_func_rollup_const class is used for wrapping constants to avoid
wrong result for ROLLUP queries with DISTINCT and a constant in the select
list. This class is also used to wrap up a NULL constant but its null_value
wasn't set accordingly. This led to a server crash.

Now the null_value of an object of the Item_func_rollup_const class is set
by its fix_length_and_dec member function.
2007-10-01 20:03:50 +00:00
mhansson@dl145s.mysql.com
96e68cfbb5 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug30832/my51-bug30832
2007-10-01 19:05:23 +02:00
gshchepa/uchum@gleb.loc
5fc81ee88e Fixed bug #31077.
mysqldump adds the "-- Dump completed on YYYY-MM-DD hh:mm:ss" string
to the end of output if the --comments switch is on.
The only way to suppress this line is to use --skip-comments/--compact
switch.

New switch has been added to the mysqldump client command line:
--dump-date.

For the compatibility with previous releases, by default the --dump-date
is on.
The --dump-date switch forces mysqldump to add date to the
"-- Dump completed on ..." string at the end of output.
The --skip-dump-date switch supresses the output of date string
and uses short form of that commentary: "-- Dump completed".
--skip-comments or --compact switches disable the whole commentary
as usual.
2007-10-01 20:35:51 +05:00
gkodinov/kgeorge@magare.gmz
0ba77db972 merge 5.0-opt -> 5.1-opt 2007-10-01 17:37:48 +03:00
gkodinov/kgeorge@magare.gmz
61085ae612 merge 5.0-opt -> 5.1-opt 2007-10-01 12:56:25 +03:00
gkodinov/kgeorge@magare.gmz
93d44a183d removed undeterministic test result from the fux for bug 30587 2007-10-01 12:51:59 +03:00
gkodinov/kgeorge@magare.gmz
72a0ad7982 fixed pb problem with the fix for bug 30587 2007-10-01 11:32:29 +03:00
mhansson/martin@linux-st28.site
967c782fa7 Merge linux-st28.site:/home/martin/mysql/src/bug30832/my50-bug30832
into  linux-st28.site:/home/martin/mysql/src/bug30832/my51-bug30832
2007-10-01 09:11:45 +02:00
evgen@moonbone.local
59b311baee view_grant.result, view_grant.test:
Corrected test case for the bug#29908.
2007-09-29 01:07:29 +00:00
evgen@moonbone.local
77dabba63f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/work/27990-bug-5.0-opt-mysql
2007-09-28 23:27:23 +00:00
evgen@moonbone.local
b9e81c2ae3 Bug#27990: Wrong info in MYSQL_FIELD struct members when a tmp table was used.
The change_to_use_tmp_fields function leaves the orig_table member of an
expression's tmp table field filled for the new Item_field being created.
Later orig_table is used by the Field::make_field function to provide some
info about original table and field name to a user. This is ok for a field
but for an expression it should be empty.

The change_to_use_tmp_fields function now resets orig_table member of
an expression's tmp table field to prevent providing a wrong info to a user.
The Field::make_field function now resets the table_name and the org_col_name
variables when the orig_table is set to 0.
2007-09-28 23:24:40 +00:00
mhansson/martin@linux-st28.site
397da9d9b7 Bug #30832: Assertion + crash with select name_const('test', now());
The NAME_CONST function is required to work correctly with constants only.
When executed with functions that return types other than those returned by
Item::field_type (string, int, decimal, or real), the result gets cast to
one of those types. This cannot happen for constants.
Fixed by only allowing constants as arguments to NAME_CONST.
2007-09-28 18:05:23 +02:00
gkodinov/kgeorge@magare.gmz
5ac2fd0b1b Merge macbook:mysql/work/B30587-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B30587-5.1-opt
2007-09-28 17:03:14 +03:00