mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33422 commits 2778 branches 343 tags 1.6 GiB
Commit graph

33422 commits

This branch
This branch
All branches
Author SHA1 Message Date
bar@mysql.com/bar.intranet.mysql.r18.ru
0d4b26fa71 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/usr/home/bar/mysql-5.0.b20396
 2006-12-08 09:48:46 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
7c1b675e72 Merging bug#22645 "LC_TIME_NAMES: Statement not replicated" from 4.1. 2006-12-05 16:01:21 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
58149eaf61 Merge mysql.com:/usr/home/bar/mysql-4.1.b22645 
into  mysql.com:/usr/home/bar/mysql-5.0.b22645
 2006-12-05 14:08:19 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
224660d14a Bug#22645 LC_TIME_NAMES: Statement not replicated 
Problem: replication of LC_TIME_NAMES didn't work.
Thus, INSERTS or UPDATES using date_format() always
worked with en_US on the slave side.
Fix: adding ONE_SHOT implementation for LC_TIME_NAMES.
 2006-12-05 13:45:21 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
a70028a855 Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails 
Problem: when loading mysqlbinlog dumps, CREATE PROCEDURE having semicolons
in their bodies failed.
Fix: Using safe delimiter "/*!*/;" to dump log entries.
 2006-11-28 16:26:15 +04:00
lars@mysql.com/black.(none)
153c57fa13 Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-22 02:23:38 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
449bd63ed0 Merge mysql.com:/usr/home/bar/mysql-4.1.b13926 
into  mysql.com:/usr/home/bar/mysql-5.0.b13926
 2006-11-21 12:25:01 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
78c74b0396 Prepare to merge "backport of bug#13926 from 5.0 to 4.1" back into 5.0: 
Moving tests into their new place into 4.1 tests section
 2006-11-21 12:09:14 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
fb419c4241 BUG#13926: --order-by-primary fails if PKEY contains quote character. 
Backporting from 5.0
 2006-11-21 11:09:33 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
a363599a81 Merge mysql.com:/usr/home/bar/mysql-4.1.b22646 
into  mysql.com:/usr/home/bar/mysql-4.1-rpl
 2006-11-20 18:08:46 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
2b25e2b3f6 After merge fix 2006-11-20 17:57:57 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
6f6868bfe2 Merge mysql.com:/usr/home/bar/mysql-4.1.b22646 
into  mysql.com:/usr/home/bar/mysql-5.0.b22646
 2006-11-20 15:06:33 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
9543b7dfba Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/usr/home/bar/mysql-5.0.b23619
 2006-11-16 13:44:23 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
d3603eb152 Merge mysql.com:/usr/home/bar/mysql-5.0-rpl 
into  mysql.com:/usr/home/bar/mysql-5.0.b23619
 2006-11-16 12:28:09 +04:00
lars@mysql.com/black.(none)
8da4385e3d Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-15 13:11:25 +01:00
lars@mysql.com/black.(none)
021d85f032 Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-15 12:41:51 +01:00
lars@mysql.com/black.(none)
ea3915dbe5 Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-15 12:40:07 +01:00
lars@mysql.com/black.(none)
a6801d4fe4 Merge mysql.com:/home/bkroot/mysql-4.1-rpl 
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
 2006-11-15 12:39:21 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
10767f3f9a Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/4.1 
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
 2006-11-15 12:55:43 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
5235785b2e bug#19402 SQL close to the size of the max_allowed_packet fails on the slave 
mending windows test.
 2006-11-15 12:53:07 +02:00
df@kahlann.erinye.com
fc4530f1bd Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-14 15:27:55 +01:00
df@kahlann.erinye.com
68335d812d Merge dev:my/mysql-5.0-release 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-14 14:58:59 +01:00
df@kahlann.erinye.com
4dd2d7062a Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-14 14:48:29 +01:00
df@kahlann.erinye.com
5d8525c6f7 make_binary_distribution should of course also copy .test files from mysql-test/include 2006-11-14 14:44:20 +01:00
df@kahlann.erinye.com
cc129e6256 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-14 14:29:58 +01:00
df@kahlann.erinye.com
a863fbbf41 make dist now copies .test files in mysql-test/include 2006-11-14 14:29:05 +01:00
joerg/mysqldev@mysql.com/production.mysql.com
2ddb61eb93 Raise version number after cloning 5.0.30 2006-11-14 13:37:10 +01:00
joerg@trift2.
d22948a193 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/mysql-5.0
 2006-11-14 12:47:53 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
650a245568 bug#19402 SQL close to the size of the max_allowed_packet fails on the slave 
ver 5.0 and 5.1 refinement.
adding to the MAX_SIZE_LOG_EVENT_STATUS estimation status vars and 
EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN
 2006-11-14 12:48:17 +02:00
lars@mysql.com/black.(none)
7aa562ad20 Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-13 17:54:01 +01:00
lars@mysql.com/black.(none)
c5d56416ba Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-13 12:44:53 +01:00
lars@mysql.com/black.(none)
de01754c19 Merge mysql.com:/home/bkroot/mysql-4.1-rpl 
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
 2006-11-13 12:44:24 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
5a20c54201 bug#19402 SQL close to the size of the max_allowed_packet fails on the slave 
comments are fixed as was suggested in reviews.
 2006-11-12 20:01:58 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
fe5de9f5c3 Correcting BUG/WL identifier extraction to allow multiple references to auxilary 
bugs/wls in cset's comments. The targetted BUG's or WL's identifier must be specified
the first in the comments. The referred bugs wls can be typed in same as the targeted
clickable format.
If the the target of the fix is a WL and there are some references to bugs
then the first found reference is regarded as "co-target" so that the bug's identifier
comes up on the subject line along with the WL's and commit mail will update
the bug page. The latter feature can be disarmed (if there is no need to update
the referred bug's page) with typing the first a pseudo-bug pattern (bug#0).

This paticular cset will generate subject line containing bug#0 (as it was the first
referred) whereas the old version would put in the subject line the last referred
pattern (e.g bug#2147483648).
 2006-11-12 13:38:13 +02:00
kostja@bodhi.local
0f455a81dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-12 10:55:33 +03:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1319f3552c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-11-11 14:32:10 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
cddbb0f817 mysql-test-run.pl: 
Test for base directory when a RPM install corrected
 2006-11-11 14:12:30 +01:00
kostja@bodhi.local
0cdaa7c138 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-11 14:51:19 +03:00
joerg@trift2.
a19a5b5f03 Merge trift2.:/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-10 20:24:05 +01:00
tsmith@quadxeon.mysql.com
b2da711fbf Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
 2006-11-10 19:38:07 +01:00
joerg@trift2.
e47f753a85 Merge trift2.:/MySQL/M50/bug24023-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-10 19:11:26 +01:00
joerg@trift2.
32d9fdaa98 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-10 19:07:52 +01:00
joerg@trift2.
743ab0c6a4 Merge trift2.:/MySQL/M41/bug17194-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-11-10 15:54:58 +01:00
joerg@trift2.
2ab3d0bfb4 Merge trift2.:/MySQL/M41/clone-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-11-10 15:52:53 +01:00
df@kahlann.erinye.com
a185c4f6ea Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
 2006-11-10 14:49:07 +01:00
df@kahlann.erinye.com
403ecf18c6 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-10 14:44:01 +01:00
df@kahlann.erinye.com
59e33edf22 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-10 13:14:21 +01:00
df@kahlann.erinye.com
f1764fa99f add --report-features to mysql-test-run.pl 2006-11-10 13:12:08 +01:00
petr/cps@outpost.site
e06f74f9f9 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
 2006-11-10 15:05:38 +03:00
ted@ted.mysql.internal
bc9ca699fb Memory allocation bug fixed 2006-11-10 07:21:10 +03:00