serg@serg.mylan
bfe628dc92
copy-paste fixed
2005-02-22 18:45:19 +01:00
tomas@poseidon.ndb.mysql.com
8751c89c30
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-02-22 18:29:57 +01:00
tomas@poseidon.ndb.mysql.com
195de8516d
making sure that the client connect loop and server accept is stopped early at ndbd shutdown
2005-02-22 18:28:53 +01:00
serg@serg.mylan
0969942d27
64-bit safe address->string conversion
2005-02-22 18:08:33 +01:00
monty@mysql.com
dcea8122d6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-22 18:31:30 +02:00
monty@mysql.com
ee8c7a3eb5
After merge fixes
2005-02-22 18:30:40 +02:00
serg@serg.mylan
1ca547f5b2
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 17:02:16 +01:00
sergefp@mysql.com
c94258043e
Post review coding style fixes.
2005-02-22 18:34:14 +03:00
sergefp@mysql.com
1f21ac3cd3
Fix for BUG#8579 (failing test case): Allow small differences in #rows estimate in test results
2005-02-22 18:30:44 +03:00
sergefp@mysql.com
29c555f263
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-build
2005-02-22 18:22:39 +03:00
serg@serg.mylan
11e22dc08f
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 16:14:30 +01:00
sergefp@mysql.com
b2ac502699
Fix for BUG#8578 "Test case 'index_merge_ror' fails on SGI irix"
...
Take into account that bitmap_is_set() may return any non-zero zero value when the bit is set.
2005-02-22 18:00:01 +03:00
serg@serg.mylan
8cb554b3c7
merged
2005-02-22 15:31:38 +01:00
serg@serg.mylan
a4dbb3b061
compatibility fixes, crashing tests
2005-02-22 15:22:37 +01:00
heikki@hundin.mysql.fi
e70e62ad2d
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-02-22 16:20:47 +02:00
monty@mysql.com
65b37a0493
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-22 16:20:30 +02:00
heikki@hundin.mysql.fi
819af98845
trx0trx.c:
...
Disable the XA code in InnoDB crash recovery; when Jan and Sergei want to test XA, they should revert this patch
2005-02-22 16:18:34 +02:00
monty@mysql.com
e2ea35ec67
Merge with 4.1
2005-02-22 15:47:00 +02:00
jan@hundin.mysql.fi
57e474758d
Fixed a bug on InnoDB X/Open XA prepare.
2005-02-22 15:40:13 +02:00
gluh@gluh.mysql.r18.ru
c058e25397
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-22 16:39:39 +03:00
lars@mysql.com
c583eb6954
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
2005-02-22 14:17:17 +01:00
lars@mysql.com
6b06ff5956
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/bkroot/mysql-4.1
2005-02-22 14:12:42 +01:00
lars@mysql.com
d59fa45596
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
2005-02-22 14:12:23 +01:00
monty@mysql.com
5e6ba9dec8
Fix errors in my last changeset
2005-02-22 15:08:12 +02:00
jan@hundin.mysql.fi
886b406e13
Clean up prints in innodb_xa_prepare.
2005-02-22 15:03:17 +02:00
lars@mysql.com
f09466e0d7
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b8297-4.1
2005-02-22 14:03:01 +01:00
joreland@mysql.com
8ab7fd9a97
ndb - move benchmark to basic suite
2005-02-22 13:58:25 +01:00
bell@51.0.168.192.in-addr.arpa
a9b40a8c0b
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-22 14:52:26 +02:00
bell@51.0.168.192.in-addr.arpa
a867465e88
changed return value to boolean
2005-02-22 14:46:21 +02:00
monty@mysql.com
7914e24409
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-22 14:43:14 +02:00
jan@hundin.mysql.fi
e20881bfb0
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-02-22 14:40:43 +02:00
lars@mysql.com
e31ea39d0c
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
2005-02-22 13:39:41 +01:00
jan@hundin.mysql.fi
14a7a642b0
Copy X/Open XA XID from trx structure to a list in recovery.
2005-02-22 14:39:15 +02:00
bar@mysql.com
5ef265f219
Bug#8349 myisamchk: --set-charset does not work
...
What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message.
2005-02-22 16:37:25 +04:00
bell@51.0.168.192.in-addr.arpa
babcdb6407
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 14:34:59 +02:00
lars@mysql.com
d2ecf8e6a5
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
2005-02-22 13:29:20 +01:00
lars@mysql.com
2d1089e8c1
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
2005-02-22 13:22:34 +01:00
monty@mysql.com
f55e200248
Fixed compiler warnings
...
Fixed failing myisam.test and rpl_rotate_logs.test on some configurations
2005-02-22 14:15:50 +02:00
bar@mysql.com
89a5530822
A user variable are now always have IMPLICIT coercibility,
...
independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.
2005-02-22 15:55:40 +04:00
gluh@gluh.mysql.r18.ru
4ea9835455
Fix for bug #7476 : crash on SELECT * FROM INFORMATION_SCHEMA.TABLES(after review)
2005-02-22 14:42:44 +03:00
lars@mysql.com
1d3c67000b
BUG#6662: Changes after Guilhems and Sergs review
2005-02-22 12:40:31 +01:00
joreland@mysql.com
2ff69100ad
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-22 12:18:39 +01:00
joreland@mysql.com
4eaf1db4b8
Merge mysql.com:/home/jonas/src/fix
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-22 12:17:27 +01:00
joreland@mysql.com
c0f4bc1393
Merge mysql.com:/home/jonas/src/fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-22 12:15:56 +01:00
joreland@mysql.com
06b4b99932
wl1292 - ndb autotest - fix html reporting bug
2005-02-22 12:15:27 +01:00
bell@51.0.168.192.in-addr.arpa
9a9811f3a4
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 13:00:00 +02:00
monty@mysql.com
22a76c1dfb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-22 12:51:54 +02:00
monty@mysql.com
e2dc9b4099
Backport my_strntod() from 5.0
...
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740 )
2005-02-22 12:51:23 +02:00
bell@51.0.168.192.in-addr.arpa
04cffe4dfb
postreview fix
2005-02-22 12:43:49 +02:00
bell@51.0.168.192.in-addr.arpa
9270c24f5f
Abort procesing current item if it was substituted by view field (BUF#6894)
...
Post-review fixes
2005-02-22 12:27:08 +02:00