tnurnberg@sin.intern.azundris.com
bab988ad9c
Bug #10776 : Failure to compile ndb ReadNodesConf.cpp on AIX 5.2
...
5.1 specific fixes so cluster will build on AIX (with IBM compiler)
2007-08-01 09:24:01 +02:00
tnurnberg@sin.intern.azundris.com
d02dd25198
Merge sin.intern.azundris.com:/home/tnurnberg/10776/50-10776
...
into sin.intern.azundris.com:/home/tnurnberg/10776/51-10776
2007-08-01 05:07:58 +02:00
tnurnberg@sin.intern.azundris.com
8dd4751be9
Bug #10776 : Failure to compile ndb ReadNodesConf.cpp on AIX 5.2
...
mysqld hasn't been built on AIX with ndb-everything in quite a while.
this allowed a variety of changes to be added that broke the AIX build
for both the GNU and IBM compilers (but the IBM suite in particular).
Changeset lets build to complete on AIX 5.2 for users of the GNU and
the IBM suite both. Tudo bem?
2007-08-01 04:56:58 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
8e22343c58
after-merge fixup
2007-07-20 15:19:37 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
93f894903e
Merge mysql.com:/home/ram/work/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b28125/b28125.5.1
2007-07-20 14:08:10 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7c156aa286
after-merge fixup.
2007-07-20 11:45:08 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
0d3e93b174
Merge mysql.com:/home/ram/work/b29923/b29923.5.0
...
into mysql.com:/home/ram/work/b29923/b29923.5.1
2007-07-20 11:40:44 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4a52b5c885
Fixed #29923 : federated.test fails in 5.0-maint, 5.1-maint
...
Result adjusted.
2007-07-20 11:23:38 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
e6550a65f4
Merge mysql.com:/home/ram/work/b28125/b28125.5.0
...
into mysql.com:/home/ram/work/b28125/b28125.5.1
2007-07-20 10:30:40 +05:00
dkatz@damien-katzs-computer.local
216c669b7e
Merge damien-katzs-computer.local:/Users/dkatz/mysql51
...
into damien-katzs-computer.local:/Users/dkatz/51
2007-07-19 17:03:50 -04:00
cmiller@zippy.cornsilk.net
65c59c1d04
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my51-bug26909
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-07-19 15:37:43 -04:00
cmiller@zippy.cornsilk.net
784dff6da3
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my51-bug26909
2007-07-19 15:34:40 -04:00
cmiller@zippy.cornsilk.net
773861ded7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-07-19 15:33:27 -04:00
cmiller@zippy.cornsilk.net
e49d38a382
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-07-19 15:30:49 -04:00
dkatz@damien-katzs-computer.local
887a11071f
Bug #29910 Sporadic test failure in status.test
2007-07-19 15:25:54 -04:00
dkatz@damien-katzs-computer.local
d81c502b8f
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/mysql51
2007-07-19 13:36:37 -04:00
dkatz@damien-katzs-computer.local
8ca3dc3311
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50
2007-07-19 13:27:31 -04:00
tsmith@ramayana.hindu.god
27ef95237d
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-07-18 15:32:22 -06:00
tsmith@ramayana.hindu.god
f4309e1777
ddl_i18n_utf8.test, ddl_i18n_koi8r.test:
...
Don't run test with embedded server; requires external client connections
2007-07-18 15:31:24 -06:00
cmiller@zippy.cornsilk.net
832fd24c41
Bug#26909: Specified key was too long; max key length is 255 bytes \
...
when creating table
Federated tables had an artificially low maximum of key length,
because the handler failed to implement a method to return it and
the default value is taked from the prototype handler.
Now, implement that method and return the maximum possible key
length, which is that of InnoDB.
2007-07-18 14:03:58 -04:00
cmiller@zippy.cornsilk.net
4463163c11
Re-set the plugin name so that we can be sure the plugin init()
...
function doesn't set it to something else.
2007-07-18 13:37:56 -04:00
cmiller@zippy.cornsilk.net
5d0b7dea04
Move the filling of the table_name column above the initialization,
...
so that the init function has access to the name.
2007-07-18 12:27:54 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
100faf97c4
Fix for bug #28125 : ERROR 2013 when adding index.
...
Problem: we may break a multibyte char sequence using a key
reduced to maximum allowed length for a storage engine
(that leads to failed assertion in the innodb code,
see also #17530 ).
Fix: align truncated key length to multibyte char boundary.
2007-07-18 12:13:45 +05:00
dkatz@damien-katzs-computer.local
491d945ab6
Bug #29784 YaSSL assertion failure when reading 8k key.
...
Fixed the yassl base64 decoding to correctly allocate a maximum decoded buffer size.
2007-07-17 14:43:56 -04:00
tsmith@ramayana.hindu.god
23695e4e1e
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-07-17 11:33:26 -06:00
tsmith@ramayana.hindu.god
e84e86c156
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-07-17 11:32:50 -06:00
kostja@bodhi.(none)
0d027edd6a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 13:32:19 +04:00
kostja@bodhi.(none)
19a19f81e8
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 13:13:49 +04:00
kostja@bodhi.(none)
6b3784870c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 13:10:02 +04:00
kostja@bodhi.(none)
948ba7b7fb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-07-17 13:08:23 +04:00
svoj@june.mysql.com
cb995365fb
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/test/mysql-5.1-engines
2007-07-17 13:20:32 +05:00
istruewing@chilla.local
db2884a530
Disabled a test case that reports an error on OSX.
2007-07-17 09:52:55 +02:00
tnurnberg@sin.intern.azundris.com
c01fe97165
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into sin.intern.azundris.com:/home/tnurnberg/27198/51-27198
2007-07-17 09:39:44 +02:00
tnurnberg@sin.intern.azundris.com
8d7365a4b0
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into sin.intern.azundris.com:/home/tnurnberg/27198/50-27198
2007-07-17 09:37:46 +02:00
istruewing@chilla.local
ba177535f5
Post-merge fixes
...
Disabled test cases that produce errors in a "server log".
2007-07-17 09:25:01 +02:00
tnurnberg@sin.intern.azundris.com
bc3b442998
Merge sin.intern.azundris.com:/home/tnurnberg/27198/50-27198
...
into sin.intern.azundris.com:/home/tnurnberg/27198/51-27198
2007-07-17 08:23:43 +02:00
tnurnberg@sin.intern.azundris.com
261acdbbea
Merge sin.intern.azundris.com:/home/tnurnberg/27198/41-27198
...
into sin.intern.azundris.com:/home/tnurnberg/27198/50-27198
2007-07-17 06:59:24 +02:00
dkatz@damien-katzs-computer.local
e5d23da4af
Merge damien-katzs-computer.local:/Users/dkatz/mysql51
...
into damien-katzs-computer.local:/Users/dkatz/51
2007-07-16 23:15:34 -04:00
kostja@bodhi.(none)
97bdd8030b
Fix a build break on 64 bit (uint and size_t are distinct types).
2007-07-17 01:30:57 +04:00
istruewing@chilla.local
dd7e9b9a42
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-16 23:21:08 +02:00
istruewing@chilla.local
acd2c62fd1
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-16 23:19:45 +02:00
kostja@bodhi.(none)
0e92e434d1
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 01:06:47 +04:00
kostja@bodhi.(none)
b8fc731804
Post-merge fixes (merge from the main).
2007-07-17 00:59:21 +04:00
tnurnberg@sin.intern.azundris.com
7dbf738f4a
Merge sin.intern.azundris.com:/home/tnurnberg/27198/40-27198
...
into sin.intern.azundris.com:/home/tnurnberg/27198/41-27198
2007-07-16 22:38:50 +02:00
kostja@bodhi.(none)
7989c712a6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-07-16 23:41:28 +04:00
kostja@bodhi.(none)
c8a651bb41
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-16 23:38:55 +04:00
kostja@bodhi.(none)
1ecb226efa
Bug#29050 Creation of a legal stored procedure fails if a database is not
...
selected prior: ensure the fix also works for information_schema
tables.
2007-07-16 23:37:02 +04:00
kostja@bodhi.(none)
88fc7cab26
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-16 23:31:36 +04:00
dkatz@damien-katzs-computer.local
639fd4c555
Bug #29692 Single row inserts can incorrectly report a huge number of row insertions
...
This bug was caused by unitialized value that was the result of a bad 5.0 merge.
2007-07-16 14:53:05 -04:00
istruewing@chilla.local
62620ecb4e
Merge chilla.local:/home/mydev/mysql-5.0-amain
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-16 20:39:05 +02:00