mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20206 commits 2790 branches 343 tags 1.7 GiB
Commit graph

20206 commits

This branch
This branch
All branches
Author SHA1 Message Date
gluh@gluh.mysql.r18.ru
eac72d405f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-23 12:08:35 +03:00
jimw@mysql.com
41043bb3f5 Merge 2005-02-22 16:39:21 -08:00
lars@mysql.com
ef4261d34a Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 2005-02-23 00:53:00 +01:00
lars@mysql.com
e330e2698d After merge fixes 2005-02-23 00:50:30 +01:00
serg@serg.mylan
bd89c2d37e Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-02-23 00:13:02 +01:00
lars@mysql.com
77f46e9c43 Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 2005-02-22 23:05:53 +01:00
lars@mysql.com
c60e676371 Manual merge 4.1->5.0 2005-02-22 22:42:49 +01:00
lars@mysql.com
7271a6014f Merge 4.1->5.0 2005-02-22 22:40:34 +01:00
jimw@mysql.com
a50be4d42b Merge mysql.com:/home/jimw/my/mysql-4.1-7989 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-22 13:15:34 -08:00
jimw@mysql.com
df3c8db4f3 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-22 13:14:49 -08:00
serg@serg.mylan
1f3bff8824 forget savepoints at the end of transaction 2005-02-22 21:57:57 +01:00
sergefp@mysql.com
cdadc990e4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug8397
 2005-02-22 21:59:42 +03:00
sergefp@mysql.com
359e554137 Coding style fixes according to Sergei's feedback 2005-02-22 21:59:02 +03:00
sergefp@mysql.com
18373b1611 Fix for BUG#8397 (second commit after review): 
In Item_cache_decimal::store(item) the call item->val_decimal_result() 
returns NULL if the passed item has an SQL null value. Don't try copying
NULL into Item_cache_decimal::val in this case.
 2005-02-22 21:58:10 +03:00
serg@serg.mylan
bfe628dc92 copy-paste fixed 2005-02-22 18:45:19 +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
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
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
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