mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47276 commits 2784 branches 343 tags 1.6 GiB
Commit graph

47276 commits

This branch
This branch
All branches
Author SHA1 Message Date
mats@kindahl-laptop.dnsalias.net
143a895b4f Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
 2007-06-12 22:14:54 +02:00
mats@kindahl-laptop.dnsalias.net
ec58bfb28a Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
 2007-06-12 22:02:46 +02:00
mats@kindahl-laptop.dnsalias.net
526a0cecda BUG#23051 (READ COMMITTED breaks mixed and statement-based 
replication):

Patch to add binlog format capabilities to the InnoDB storage engine.
The engine will not allow statement format logging when in READ COMMITTED
or READ UNCOMMITTED transaction isolation level.

In addition, an error is generated when trying to use READ COMMITTED
or READ UNCOMMITTED transaction isolation level in STATEMENT binlog
mode.
 2007-06-12 21:47:00 +02:00
mats@kindahl-laptop.dnsalias.net
f317103ef5 Adding new files to CMakeLists.txt to make it build on Windows. 2007-06-12 09:38:30 +02:00
mats@kindahl-laptop.dnsalias.net
9278400179 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
 2007-06-11 22:18:10 +02:00
mats@kindahl-laptop.dnsalias.net
7bc43ebfc9 BUG#24954 (Last_errno and Last_error not set after master_retry_count has 
been reached):

Post-merge patch to handle all the changes to the tree since the tree
was cloned.
 2007-06-11 22:15:39 +02:00
lars/lthalmann@dl145k.mysql.com
42cb31482c Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-11 16:49:12 +02:00
lars/lthalmann@dl145j.mysql.com
c35447dd12 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-11 16:48:05 +02:00
lars/lthalmann@dl145k.mysql.com
e7fb84c1a0 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-11 16:47:50 +02:00
lars/lthalmann@dl145j.mysql.com
f22f72078b Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-11 16:46:46 +02:00
lars/lthalmann@dl145k.mysql.com
4c3cd2f692 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-11 16:43:42 +02:00
lars/lthalmann@dl145k.mysql.com
2112634685 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-11 16:42:24 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
4829d2f6ce Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-06-11 16:41:46 +02:00
joerg@trift2.
ed583630b0 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-11 16:00:32 +02:00
joerg@trift2.
07785ec533 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-11 15:54:05 +02:00
lars/lthalmann@dl145j.mysql.com
eceb3acc03 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-11 10:13:09 +02:00
lars/lthalmann@dl145k.mysql.com
c9d1b262e3 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-11 09:55:34 +02:00
lars/lthalmann@dl145k.mysql.com
d798f52aa0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-11 09:44:15 +02:00
mats@kindahl-laptop.dnsalias.net
a4c6ff8551 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
 2007-06-09 08:29:51 +02:00
mats@kindahl-laptop.dnsalias.net
9094e97aed BUG#24954 (Last_errno and Last_error not set after master_retry_count was reached): 
Adding new fields Last_{IO,SQL}_Errno and Last_{IO,SQL}_Error to output
of SHOW SLAVE STATUS to hold errors from I/O and SQL thread respectively.
Old fields Last_Error and Last_Errno are aliases for Last_SQL_Error and
Last_SQL_Errno respectively.

Fields are added last to output of SHOW SLAVE STATUS to allow old applications
to use the same positional arguments into the row, while allowing new
application to benefit from the added information.

In addition, some new error codes are added (especially for the I/O
thread) to be able to provide sensible error message.
 2007-06-09 07:19:37 +02:00
rafal@quant.(none)
66980a7bcd Merge rsomla@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl-a
 2007-06-08 13:16:15 +02:00
bar@bar.myoffice.izhnet.ru
a70f93c11b Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28916 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28916
 2007-06-08 14:53:32 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
a8b2d9c951 Makefile.am: 
Installing the new file required for tests.
 2007-06-08 14:51:32 +05:00
rafal@quant.(none)
02f02d9def Merge rsomla@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl-a
 2007-06-08 10:42:48 +02:00
bar@bar.myoffice.izhnet.ru
170e900bd9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b28916
 2007-06-08 13:25:25 +05:00
bar@bar.myoffice.izhnet.ru
59cb56017b Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28916 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28916
 2007-06-08 13:18:36 +05:00
rafal@quant.(none)
4158f43a1f Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21123 
into  quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl-a
 2007-06-07 20:07:23 +02:00
joerg@trift2.
160b784a49 Merge trift2.:/MySQL/M41/bug23504-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-07 17:00:13 +02:00
joerg@trift2.
ee116570dc Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-07 16:37:15 +02:00
joerg@trift2.
d870247de1 Merge trift2.:/MySQL/M41/bug23504-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-07 16:29:59 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
d3c4f1b22b Bug#28916 LDML doesn't work for utf8 
and is not described in the manual
- Adding missing initialization for utf8 collations
- Minor code clean-ups: renaming variables,
  moving code into a new separate function.
- Adding test, to check that both ucs2 and utf8 user
  defined collations work (ucs2_test_ci and utf8_test_ci)
- Adding Vietnamese collation as a complex user defined
  collation example.
 2007-06-07 17:55:55 +05:00
joerg@trift2.
0d84c3f710 netware/*.def : Allocate 128K stack for all executables (bug#23504) 2007-06-07 12:59:31 +02:00
bar@bar.myoffice.izhnet.ru
58aaf6af2d Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b26711 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b26711
 2007-06-07 13:43:20 +05:00
bar@bar.myoffice.izhnet.ru
c86b91ee92 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b26711
 2007-06-07 13:17:19 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
fef1be0548 Bug#26711 "Binary content 0x00 sometimes becomes 0x5C 0x00 after dump/load" 
Problem: "SELECT INTO OUTFILE" created incorrect dumps for BLOBs,
so "LOAD DATA" later incorrectly interpreted 0x5C as the second
byte of a multi-byte sequence, instead of escape character.
Fix: adding escaping of multi-byte heads.
 2007-06-07 13:16:49 +05:00
joerg@trift2.
111212aa40 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-06 20:10:52 +02:00
joerg@trift2.
d8c385c397 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-06 20:06:59 +02:00
joerg@trift2.
449cd28598 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-06 19:59:18 +02:00
tsmith@quadxeon.mysql.com
75ed2c7d16 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
 2007-06-06 19:00:15 +02:00
joerg@trift2.
66a17c5839 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-06 17:39:22 +02:00
tomas@whalegate.ndb.mysql.com
016cf69867 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
 2007-06-06 16:51:04 +02:00
tomas@whalegate.ndb.mysql.com
7b285522f4 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-build 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
 2007-06-06 16:49:23 +02:00
joerg@trift2.
86fbe0bdf0 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-06 16:16:14 +02:00
joerg@trift2.
fef905d0bf Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-06 16:05:23 +02:00
joerg/mysqldev@mysql.com/production.mysql.com
0067a9cc02 Raise version number after cloning 4.1.23 2007-06-06 15:22:06 +02:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
89639e7679 yellow warnings on pb. Setting the plug of a harmless warning. 2007-06-06 14:34:17 +03:00
joerg@trift2.
3d95b80da9 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-06 12:02:07 +02:00
tsmith@quadxeon.mysql.com
13adcedc90 mtr_report.pl: 
Add another exception to the acceptable mysqld errors, for test case for bug 28436
 2007-06-06 03:49:24 +02:00
tsmith@quadxeon.mysql.com
60f6e71ef8 ctype-bin.c: 
Post-merge fix warning
 2007-06-06 00:22:35 +02:00
tsmith@quadxeon.mysql.com
6d86790711 sql_prepare.cc: 
Post-merge fix (byte -> uchar)
 2007-06-05 23:56:02 +02:00