database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-06 13:10:12 +03:00
Code Activity
21,744 Commits 3,261 Branches 1,092 Tags
a47bc28876dfe34839c2bc76c33e1639eda075d7
Commit Graph

6356 Commits

Author SHA1 Message Date
bell@51.0.168.192.in-addr.arpa
99114bb60e Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
 2005-02-23 23:00:41 +02:00
bell@51.0.168.192.in-addr.arpa
8655e4327e 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-qc_item_view-5.0
 2005-02-23 22:56:24 +02:00
bell@51.0.168.192.in-addr.arpa
270d93b83d 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-23 22:16:51 +02:00
serg@serg.mylan
b8288584e9 innodb-dependent test moved from rpl_rotate_logs.test to binlog.test 2005-02-23 20:35:59 +01:00
serg@serg.mylan
e38b3e2390 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-02-23 20:10:58 +01:00
mskold@mysql.com
07cdc9e334 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-23 20:08:21 +01:00
guilhem@mysql.com
624aaa4b09 result fixes after my change to mysqlbinlog (which was accidentally 
pushed some minutes ago)
 2005-02-23 19:59:25 +01:00
mats@mysql.com
6ad51ffb3c Bug#8412: Merge from 4.0 2005-02-23 19:58:54 +01:00
mats@mysql.com
a4cdb93b38 Merge mysql.com:/home/bkroot/mysql-4.0 
into mysql.com:/home/bk/b8412-mysql-4.0
 2005-02-23 19:40:31 +01:00
serg@serg.mylan
9c9d1fd406 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-02-23 19:20:17 +01:00
patg@krsna.patg.net
0909b09b43 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.patg.net:/home/patg/mysql-5.0
 2005-02-23 09:35:18 -08:00
serg@serg.mylan
383c6e312a don't log BEGIN in auto-commit mode 
correct end_log_pos for Xid_log_event
 2005-02-23 18:26:49 +01:00
bell@52.0.168.192.in-addr.arpa
25e87cd6f7 Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
 2005-02-23 19:22:52 +02:00
gluh@gluh.mysql.r18.ru
c6f1e9627a Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-02-23 20:22:51 +03:00
gluh@gluh.mysql.r18.ru
fc9c20995f Fix for bug #6572: SHOW ERRORS doesn't 2005-02-23 20:18:21 +03:00
mskold@mysql.com
e0dbdca79e ha_ndbcluster.cc: 
Fixed faulty debug printout
ndb_condition_pushdown.test, ndb_condition_pushdown.result:
  Added BINARY and VARBINARY tests
 2005-02-23 17:18:06 +01:00
gluh@gluh.mysql.r18.ru
907c7af3ce Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-02-23 18:47:00 +03:00
gluh@gluh.mysql.r18.ru
2b5ee94a33 Fix for bug#6317: string function CHAR, parameter is NULL, wrong result 2005-02-23 18:15:45 +03:00
mskold@mysql.com
364492239b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-23 15:54:22 +01:00
mskold@mysql.com
fcc37a0787 Fixes for condition pushdown to storage engine based on comments from code review 2005-02-23 15:51:26 +01:00
serg@serg.mylan
da13ab086d write "COMMIT" into binlog if there's no Xid at the end of transaction 
new tests
 2005-02-23 14:55:16 +01:00
gluh@gluh.mysql.r18.ru
3e9bf3af34 Fix for bug #7217: information_schema: columns are varbinary() instead of timestamp & 
bug #7215: information_schema: columns are longtext instead of varchar
 2005-02-23 15:15:36 +03:00
tomas@poseidon.ndb.mysql.com
5a7f3ce9c1 Merge 2005-02-23 10:29:31 +01:00
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
patg@krsna.patg.net
02a25fd48a WL# 2094 Federated Storage Handler 
Patch #2, all coding style changes per Kostja's review 
(as requested to keep style changes separate from functionality changes),
as well as changes to the test suit to no longer use hard-coded port 
values in foreign table creation statement
 2005-02-23 00:38:29 -08:00
jimw@mysql.com
41043bb3f5 Merge 2005-02-22 16:39:21 -08:00
lars@mysql.com
e330e2698d After merge fixes 2005-02-23 00:50:30 +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
7271a6014f Merge 4.1->5.0 2005-02-22 22:40:34 +01: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
patg@krsna.patg.net
e3579fa672 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.patg.net:/home/patg/mysql-5.0
 2005-02-22 11:02:21 -08: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
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
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
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
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
monty@mysql.com
e2ea35ec67 Merge with 4.1 2005-02-22 15:47:00 +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
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
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
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
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