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
tsmith@ramayana.hindu.god
5a1284ccb2
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-09-28 10:54:49 -06:00
msvensson@pilot.(none)
2a1e556081
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-09-27 08:49:23 +02:00
msvensson@pilot.(none)
e21bb2640a
Move DBUG_ENTER to begining of function to avoid build failure with debug on windows
2007-09-27 08:48:39 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
6257abbc83
Raise version number after cloning 5.0.50
2007-09-26 19:15:42 +02:00
df@pippilotta.erinye.com
461f559adf
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-09-25 17:42:25 +02:00
tsmith@sita.local
a3c5169d0d
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into sita.local:/Users/tsmith/m/bk/maint/50
2007-09-24 13:22:39 +02:00
msvensson@shellback.(none)
d07a83eadf
Add test for named pipes on windows
...
Improve test for shm on windows
2007-09-24 12:42:44 +02:00
tsmith@sita.local
5aba321046
Merge sita.local:/Users/tsmith/m/bk/50
...
into sita.local:/Users/tsmith/m/bk/maint/50
2007-09-24 11:33:27 +02:00
jonathan@bagpuss.adsl.perkin.org.uk
3b3be2ada1
Revert previous attempt to fix bug#27693, the files removed from the
...
cmake list are auto-generated and thus still required. Correct fix
not yet known.
2007-09-22 16:29:15 +02:00
msvensson@shellback.(none)
d8fd59a423
Bug#30843 Bad Test addition to t/archive.test
2007-09-22 12:17:14 +02:00
iggy@alf.(none)
b6708a9757
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into alf.(none):/src/bug15327/my50-bug15327
2007-09-22 03:11:12 -04:00
msvensson@shellback.(none)
ed055965bf
- Increase default connect_timeout to avoid intermittent
...
disconnects when test servers are put under load
2007-09-21 17:52:02 +02:00
iggy@alf.(none)
9c9c82e04e
Bug #15327 : configure: --with-tcp-port option being partially ignored
...
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout.
2007-09-21 11:38:23 -04:00
msvensson@shellback.(none)
10816b3a08
Bug#28359 Intermitted lost connection at 'reading authorization packet' errors
...
- Increase default 'connect_timeout' value to 10 seconds
2007-09-21 17:10:45 +02:00
msvensson@shellback.(none)
beaf564140
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-09-21 16:39:05 +02:00
msvensson@shellback.(none)
e41434fb95
Bug#30843 Bad Test addition to t/archive.test
...
- Add extra insert
2007-09-21 09:48:30 +02:00
gluh@mysql.com/eagle.(none)
4ffcc4f266
result fix
2007-09-20 14:38:41 +05:00
gluh@mysql.com/eagle.(none)
6b81174cde
Bug#27747 database metadata doesn't return sufficient column default info
...
added get_field_default_value() function which obtains default value from the field
(used in store_create_info() & get_schema_column_record() functions)
2007-09-20 13:54:46 +05:00
gluh@eagle.(none)
56c927e696
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-09-19 13:50:38 +05:00
gshchepa@devsrv-b.mysql.com
0aa6e95768
select.test:
...
Post-fix for bug#27695.
2007-09-15 07:04:32 +02:00
tnurnberg@sin.intern.azundris.com
7451aaf48c
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/tnurnberg/15327/50-15327
2007-09-15 04:45:20 +02:00
gshchepa@devsrv-b.mysql.com
4bf2408ed4
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
2007-09-14 21:15:43 +02:00
joerg@trift2.
0cdf470a2e
Merge trift2.:/MySQL/M41/push-4.1
...
into trift2.:/MySQL/M50/push-5.0
2007-09-14 19:47:38 +02:00
joerg@trift2.
100f69154d
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-09-14 19:23:05 +02:00
joerg@trift2.
e78513165c
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-09-14 19:21:02 +02:00
gkodinov/kgeorge@magare.gmz
0133bc639c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B31001-5.0-opt
2007-09-14 19:04:47 +03:00
gkodinov/kgeorge@magare.gmz
a2afc56f61
Bug #31001 : ORDER BY DESC in InnoDB not working
...
The optimizer sets index traversal in reverse order only if there are
used key parts that are not compared to a constant.
However using the primary key as an ORDER BY suffix rendered the check
incomplete : going in reverse order must still be used even if
all the parts of the secondary key are compared to a constant.
Fixed by relaxing the check and set reverse traversal even when all
the secondary index keyparts are compared to a const.
Also account for the case when all the primary keys are compared to a
constant.
2007-09-14 17:43:14 +03:00
sergefp@pylon.mylan
15b7d5e8af
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug30324
2007-09-14 15:00:10 +04:00
sergefp@mysql.com
8a3e6201b3
BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
...
- The bug was caused by COUNT(DISTINCT ...) code using Unique object in
a way that assumed that BIT(N) column occupies a contiguous space in
temp_table->record[0] buffer.
- The fix is to make COUNT(DISTINCT ...) code instruct create_tmp_table to
create temporary table with column of type BIGINT, not BIT(N).
2007-09-14 14:53:13 +04:00
tomas@whalegate.ndb.mysql.com
7cf77f49d3
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-14 11:08:55 +02:00
tomas@whalegate.ndb.mysql.com
965124b4a5
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-14 11:05:38 +02:00
gshchepa@devsrv-b.mysql.com
e6e56ccc01
Merge devsrv-b.mysql.com:/users/gshchepa/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
2007-09-14 10:11:51 +02:00
gshchepa/uchum@gleb.loc
72e36e0aa3
Merge gshchepa@bk-internal.mysql.com:/users/gshchepa/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.0-opt-27695
2007-09-14 13:11:50 +05:00
gshchepa/uchum@gleb.loc
7284a865df
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-14 12:16:19 +05:00
joerg@trift2.
1dc3246fe3
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M50/tmp-5.0
2007-09-13 23:42:17 +02:00
tnurnberg@mysql.com/sin.intern.azundris.com
3c6ca8d6ed
Bug #15327 : configure: --with-tcp-port option being partially ignored
...
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout. if they
didn't configure a value, assume "use a sensible default", which
will be read from /etc/services or, failing that, from the factory
default. That makes the order of preference
- command-line option
- my.cnf, where applicable
- $MYSQL_TCP_PORT environment variable
- /etc/services (unless configured --with-tcp-port)
- default port (--with-tcp-port=... or factory default)
2007-09-13 16:19:46 +02:00
gshchepa/uchum@gleb.loc
e4eadcfbdd
Fixed bug #27695 .
...
Declaring an all space column name in the SELECT FROM DUAL or in a view
leads to misleading warning message:
"Leading spaces are removed from name ' '".
The Item::set_name method has been modified to raise warnings like
"Name ' ' has become ''" in case of the truncation of an all
space identifier to an empty string identifier instead of the
"Leading spaces are removed from name ' '" warning message.
2007-09-13 18:41:50 +05:00
mskold/marty@linux.site
f2159e2d21
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-09-13 10:35:11 +02:00
mskold/marty@mysql.com/linux.site
44b6c2edad
bug#27494 An invalid subselect crashes mysql server: Added check for missing arguments
2007-09-13 09:47:21 +02:00
gshchepa/uchum@gleb.loc
2e7306d503
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-13 11:48:58 +05:00
gshchepa/uchum@gleb.loc
ff042427cf
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-12 23:41:35 +05:00
sergefp@mysql.com
1ff0caf49d
Better wording in comments
2007-09-12 18:13:19 +04:00
tomas@whalegate.ndb.mysql.com
df552c310d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-12 14:01:51 +02:00
tomas@whalegate.ndb.mysql.com
83eed4d876
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
2007-09-12 13:55:22 +02:00
tomas@whalegate.ndb.mysql.com
461a3dccac
BUG#23354 revert
2007-09-12 13:53:32 +02:00
tomas@whalegate.ndb.mysql.com
f1674d1b66
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-12 07:34:42 +02:00
sergefp@mysql.com
06f12f66e8
Post-merge fixes
2007-09-12 01:52:27 +04:00
sergefp@mysql.com
6f702a4b42
Post-merge fixes
2007-09-11 02:41:42 +04:00