mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46985 commits 2774 branches 343 tags 1.6 GiB
Commit graph

46985 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
skozlov/ksm@mysql.com/virtop.localdomain
69e2b72522 WL#3694, fix for events 2007-06-05 23:59:05 +04:00
lars/lthalmann@mysql.com/dl145h.mysql.com
7965816fff Manual merge 2007-06-05 03:02:59 +02:00
lars/lthalmann@dl145j.mysql.com
f402776d3b Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-05 01:20:50 +02:00
lars/lthalmann@dl145h.mysql.com
98501127fb Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-05 01:15:07 +02:00
lars/lthalmann@dl145h.mysql.com
b53b448d45 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-05 01:14:10 +02:00
skozlov/ksm@mysql.com/virtop.localdomain
caa1560408 WL#3694 2007-06-04 20:44:25 +04:00
igor@olga.mysql.com
76b580b84e Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-06-04 05:57:57 -07:00
igor@olga.mysql.com
d0cb11e6ba Post-merge fix. 2007-06-04 05:55:27 -07:00
skozlov/ksm@mysql.com/virtop.localdomain
789088fc5b WL#3694, updated by pushbuild errors 2007-06-04 16:50:29 +04:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
4137125f34 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
 2007-06-04 15:08:55 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
f544286789 Bug #27716 multi-update did partially and has not binlogged 
manual merge with 5.0: automatic merge went incorrectly; fixing tests in rbr mode.
 2007-06-04 15:02:40 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
ed427617cf WL#3694, Added option files for master/slave 2007-06-04 14:45:36 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
62610402bf WL#3694, Result file for test case moved to proper directory 2007-06-04 14:39:34 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
da4dfefa5e WL#3694 Replication of Invocation and Invoked Features Testing 2007-06-04 14:18:22 +04:00
igor@olga.mysql.com
a5011de0a8 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt-merge
 2007-06-04 03:16:17 -07:00
igor@olga.mysql.com
31c57a1efc Post-merge fix. 2007-06-04 03:03:15 -07:00
mhansson@dl145s.mysql.com
d9fcc304d9 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741
 2007-06-04 09:26:54 +02:00
igor@olga.mysql.com
ca49b83d5a Merge olga.mysql.com:/home/igor/mysql-5.1 
into  olga.mysql.com:/home/igor/mysql-5.1-opt-merge
 2007-06-03 22:52:02 -07:00
mhansson@dl145s.mysql.com
358567dfab Merge bk-internal:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/dev/shm/mhansson/my51-bug27741-mpush
 2007-06-03 23:31:57 +02:00
evgen@moonbone.local
b642eb121f item_func.h, item_func.cc: 
Post merge fix for the bug#28494.
 2007-06-03 21:52:00 +04:00
igor@olga.mysql.com
44b46b73f2 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-03 07:58:07 -07:00
evgen@moonbone.local
6acad85a95 Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-06-03 16:06:55 +04:00
evgen@moonbone.local
27d956b5e9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-03 16:00:04 +04:00
evgen@moonbone.local
88147d5cfe user_var.result: 
Corrected test case result for the bug#28494.
item_func.h, item_func.cc:
  Corrected function names after fix for the bug#28494.
 2007-06-03 15:56:48 +04:00
evgen@moonbone.local
5d695b777a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-03 14:46:37 +04:00
evgen@moonbone.local
7dbe9d3318 user_var.result, user_var.test: 
Extended test case for the bug#28494.
 2007-06-03 14:46:09 +04:00
igor@olga.mysql.com
cc0eff3e63 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-03 00:21:42 -07:00
gkodinov/kgeorge@macbook.gmz
8fd809bfd8 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B26162-5.0-opt
 2007-06-03 10:03:37 +03:00
gkodinov/kgeorge@macbook.gmz
9a1d8adc9d Bug #26162: Trigger DML ignores low_priority_updates setting 
The value of "low-priority-updates" option and the LOW PRIORITY
prefix was taken into account at parse time.
This caused triggers (among others) to ignore this flag (if
supplied for the DML statement).
Moved reading of the LOW_PRIORITY flag at run time.
Fixed an incosistency when handling
SET GLOBAL LOW_PRIORITY_UPDATES : now it is in effect for
delayed INSERTs.
Tested by checking the effect of LOW_PRIORITY flag via a 
trigger.
 2007-06-03 09:40:00 +03:00
evgen@moonbone.local
9967e513a5 Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-06-03 09:17:31 +04:00
igor@olga.mysql.com
91da3132b5 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-02 14:37:42 -07:00
evgen@moonbone.local
f4e20490a4 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-03 01:25:24 +04:00
evgen@moonbone.local
162a6b42ec item_func.cc: 
Post fix for bug#28494.
  The Item_func_set_user_var::check method now silently doesn't use result_field
  if it isn't defined.
 2007-06-03 01:24:56 +04:00
evgen@moonbone.local
400bfb92b8 Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-06-02 23:49:52 +04:00
igor@olga.mysql.com
55fea25de4 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-02 12:46:48 -07:00
evgen@moonbone.local
294ead9ac9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-02 23:20:54 +04:00