Commit graph

50110 commits

Author SHA1 Message Date
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 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
joerg@trift2.
571200d487 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-10-04 19:31:32 +02:00
joerg@trift2.
82767a0a45 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-04 19:24:32 +02:00
mhansson@dl145s.mysql.com
02dacd20e8 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
2007-10-04 15:32:46 +02: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
mhansson@dl145s.mysql.com
eb8d5c36c9 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
2007-10-04 13:58:34 +02: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
jperkin@production.mysql.com
09560c6539 Merge production.mysql.com:/usersnfs/jperkin/bk/build/5.0
into  production.mysql.com:/usersnfs/jperkin/bk/build/5.1
2007-10-04 12:21:51 +02:00
jperkin@production.mysql.com
583a3ef31d Merge production.mysql.com:/usersnfs/jperkin/bk/build/5.0
into  production.mysql.com:/usersnfs/jperkin/bk/bug-27692/5.0
2007-10-04 12:06:13 +02:00
jperkin@production.mysql.com
5c0c592145 Restore creation of test databases and the anonymous user which
were accidentally removed during a previous rototill of this
code.  Fixes bug#27692.
  
While it can be argued we should strive to provide a 'secure by
default' installation, this happens to be the setup currently
documented in the manual as the default, so defer changes that
improve security out of the box to a co-ordinated effort later
on.
  
For now, make a note about the test databases and anonymous user
in mysql_install_db and recommend that mysql_secure_installation
be ran for users wishing to remove these defaults.

[..re-commit of previously lost change..]
2007-10-04 11:30:30 +02: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
mhansson@dl145s.mysql.com
c10447053c Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into  dl145s.mysql.com:/data0/mhansson/bug30942/my50-bug30942
2007-10-04 11:06:01 +02:00
mhansson/martin@linux-st28.site
ec959efa71 Merge linux-st28.site:/home/martin/mysql/src/bug30942/my50-bug30942
into  linux-st28.site:/home/martin/mysql/src/bug30942/my51-bug30942
2007-10-04 10:06:33 +02:00
mhansson/martin@linux-st28.site
028992ac69 Bug : select str_to_date from derived table returns varying results
The function str_to_date has a field to say whether it's invoked constant 
arguments. But this member was not initialized, causing the function to
think that it could use a cache of the format type when said cache was in 
fact not initialized.
Fixed by initializing the field to false.
2007-10-04 09:15:26 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
16db036d82 Bug gis types in union'd select cause crash.
We use get_geometry_type() call to decide the exact type
of a geometry field to be created (POINT, POLYGON etc)
Though this function was only implemented for few items.
In the bug's case we need to call this function for the
Item_sum instance, where it was not implemented, what is
the reason of the crash.
Fixed by implementing virtual Item::get_geometry_type(),
so it can be called for any Item.
2007-10-04 12:01:28 +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 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 : 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 : post-commit fix.
2007-10-03 02:50:38 +05:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
6515a7f4c3 testScanFilter.cpp:
Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break
2007-10-02 21:21:45 +02: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
kent@kent-amd64.(none)
6598c8dc2d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-install/mysql-5.1-build
2007-10-01 18:52:25 +02:00
kent@mysql.com/kent-amd64.(none)
4d2c8e2445 make_binary_distribution.sh:
Added special handling of "mysql_install_db" and "mysql.server" scripts,
  find executables relative to the current directory.
2007-10-01 18:41:38 +02:00
gshchepa/uchum@gleb.loc
5fc81ee88e Fixed bug .
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
joerg@trift2.
3114699f56 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-10-01 12:31:24 +02:00
joerg@trift2.
a4450a710c Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-01 12:19:06 +02:00