kaa@polly.(none)
605f0b05a8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-04 13:45:45 +04:00
kaa@polly.(none)
84659e2de1
Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-04 13:38:58 +04:00
pekka@sama.ndb.mysql.com
82da7623d4
ndb - bug#29390: if ScanFilter is too large, abort or optionally discard it
2007-10-04 11:32:49 +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
kaa@polly.(none)
bd885daa4f
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-04 13:29:37 +04:00
aelkin/elkin@koti.dsl.inet.fi
4c6e14ce8d
Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/5.1-merge
2007-10-04 12:27:14 +03: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
kaa@polly.(none)
8f204ea029
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
2007-10-04 13:07:11 +04: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
kaa@polly.(none)
1ba3f4f56b
Issue a warning if a user sets an option or a variable to a value that is greater than a defined maximum for the option/variable.
...
This is for bug #29446 "Specifying a myisam_sort_buffer > 4GB on 64 bit machines not possible". Support for myisam_sort_buffer_size > 4 GB on 64-bit Windows will be looked at later in 5.2.
2007-10-04 12:34:00 +04: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
bar@mysql.com/bar.myoffice.izhnet.ru
2b42750a51
Bug#29323 mysql client only accetps ANSI encoded files
...
Fix: ignore BOM marker in the first line.
2007-10-04 13:06:01 +05:00
mhansson/martin@linux-st28.site
028992ac69
Bug #30942 : 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
ramil/ram@ramil.myoffice.izhnet.ru
b5347808ed
Merge mysql.com:/home/ram/work/b31070/b31070.5.0
...
into mysql.com:/home/ram/work/b31070/b31070.5.1
2007-10-04 12:10:15 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
6e6727d244
merging: results adjusted
2007-10-04 12:09:22 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
fa252fec68
Merge mysql.com:/home/ram/work/b31070/b31070.4.1
...
into mysql.com:/home/ram/work/b31070/b31070.5.0
2007-10-04 10:54:51 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bc9b4834e1
Fix for bug #31069 : crash in 'sounds like'
...
and for bug #31070 : crash during conversion of charsets
Problem: passing a 0 byte length string to some my_mb_wc_XXX()
functions leads to server crash due to improper argument check.
Fix: properly check arguments passed to my_mb_wc_XXX() functions.
2007-10-04 10:20:00 +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
bar@bar.myoffice.izhnet.ru
3745968ddc
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b30315
...
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
2007-10-03 12:18:17 +05:00
bar@bar.myoffice.izhnet.ru
5efd35b0f3
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b30315
...
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
2007-10-03 12:02:30 +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
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
mskold/marty@linux.site
a26772ca21
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-10-02 14:23:59 +02:00
mskold/marty@mysql.com/linux.site
403f0afc29
Bug#25817 UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks
2007-10-02 13:36:13 +02:00
tomas@whalegate.ndb.mysql.com
132dba0020
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-10-02 11:38:14 +02:00
tomas@whalegate.ndb.mysql.com
0c4b410dae
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
2007-10-02 11:36:17 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
065bcba38e
Fixing comments to use "#" instead of "--"
2007-10-02 13:28:58 +05: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
monty@narttu.mysql.fi
5dcb64882d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-10-01 15:33:21 +03:00
monty@mysql.com/narttu.mysql.fi
315acca125
Removed extra spaces
...
Added extra debug
2007-10-01 15:32:07 +03:00
bar@mysql.com/bar.myoffice.izhnet.ru
aacebc7ce8
Bug#30315 Character sets: insertion of euckr code value 0xa141 fails
...
Problem: some valid euc-kr characters were rejected because
condition checking multi-byte tail didn't allow
multi-byte characters having the second byte in the ranges
[0x41..0x5A] and [0x61..0x7A].
Fix: allow these byte ranges for mb tails
2007-10-01 15:35:42 +05:00
joerg@trift2.
7c0f4a7a2e
Fix bug#31150 "Test case does not cleanup":
...
Add the cleanup by dropping the database 'track' in test "rpl_bug31076".
2007-10-01 12:10:46 +02: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
lars/lthalmann@dl145h.mysql.com
b6553689fd
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-10-01 11:25:32 +02:00
lars/lthalmann@dl145h.mysql.com
b89dcdffcd
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-10-01 11:24:11 +02:00
svoj@june.mysql.com
0a81f49b25
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG30583/mysql-5.1-engines
2007-10-01 14:23:16 +05: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
anozdrin/alik@station.
b3ca730786
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into station.:/mnt/raid/alik/MySQL/devel/bug-30472/5.1-rt-bug30472
2007-09-29 02:47:19 +04:00