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

10686 commits

Author SHA1 Message Date
mats@mysql.com
db4316a948 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/w3171-mysql-5.1-new
 2006-03-08 06:58:57 +01:00
mats@mysql.com
6a1d4bac6e WL#3171: Dynamic logging format 
Removed error on seeing table map event when slave is in SBR mode
  and switching temporarily to RBR mode to replicate the rows.
 2006-03-08 06:55:21 +01:00
kent@mysql.com
05f3d1710a Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-03-07 21:52:50 +01:00
serg@serg.mylan
bd4bfdd4dc Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-03-07 21:27:05 +01:00
serg@serg.mylan
7166facb71 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-03-07 20:01:03 +01:00
kent@mysql.com
0aaded3707 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-03-07 18:21:38 +01:00
mats@mysql.com
907a11e828 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/bkroot/mysql-5.1-new
 2006-03-07 15:21:39 +01:00
mats@mysql.com
67a99df970 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b16228-mysql-5.1-new
 2006-03-07 13:34:31 +01:00
mats@mysql.com
ec4b9f8edc Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b16228-mysql-5.1-new
 2006-03-07 13:31:38 +01:00
mats@mysql.com
e824e61618 Bug#16228 (RBR: Slave SQL thread retries infinitely): 
Transaction aborted on slave should be retries. The OPTION_BEGIN
  bit was cleared prematurely. Removed dependence of code on value
  of OPTION_BEGIN bit when executing retries.
 2006-03-07 13:29:53 +01:00
gluh@mysql.com
8271f58942 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
 2006-03-07 15:27:02 +04:00
gluh@eagle.intranet.mysql.r18.ru
bcf710e97c Fix for bug#15447 Partitions: NULL is treated as zero 
NULL value handling
 2006-03-07 15:25:08 +04:00
bar@mysql.com
23332d0d95 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17142
 2006-03-07 13:07:23 +04:00
bar@mysql.com
02023859bf Bug#17142 Crash if create with encoded name 
upgrade.result, upgrade.test:
  Adding test case.
table.cc:
  Don't try to open a table with old-formatted name,
  if the table name contains "@" character.
  This is to avoid mixing two different names to each other.
  Thanks Monty for suggesting this fix.
 2006-03-07 13:05:24 +04:00
msvensson@neptunus.(none)
456b2d6b14 Improve error message for faulty usage of "inc" and "dec" 2006-03-07 07:50:04 +01:00
msvensson@neptunus.(none)
f063ce8e31 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-07 07:42:51 +01:00
serg@serg.mylan
6d6d11787f after merge 2006-03-06 23:43:47 +01:00
serg@serg.mylan
84ff8192ff merged 2006-03-06 23:20:19 +01:00
msvensson@neptunus.(none)
67f6576de8 Revert 2006-03-06 22:14:06 +01:00
msvensson@neptunus.(none)
a336f48552 Win fixes 
- Use tmp sh file both in system and popen
 2006-03-06 22:05:39 +01:00
msvensson@neptunus.(none)
dfe158fc15 Use grep instead of egrep 
Use system inestad of exec
 2006-03-06 21:45:13 +01:00
pem@mysql.com
1e0289041c Merge mysql.com:/extern/mysql/bk/mysql-5.1-new 
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
 2006-03-06 21:15:43 +01:00
serg@serg.mylan
d190e08e4e merged 2006-03-06 20:53:14 +01:00
msvensson@neptunus.(none)
6634aec877 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-06 20:24:21 +01:00
msvensson@neptunus.(none)
0acda1463d Update test result 2006-03-06 20:12:48 +01:00
msvensson@neptunus.(none)
aa3c00b5df Update test result 2006-03-06 20:09:16 +01:00
msvensson@neptunus.(none)
3ae351931d Update test result 2006-03-06 20:06:56 +01:00
pem@mysql.com
a065843799 Merge mysql.com:/extern/mysql/5.0/generic/mysql-5.0 
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
 2006-03-06 19:46:17 +01:00
serg@serg.mylan
e7504b3468 merged 2006-03-06 18:34:38 +01:00
serg@serg.mylan
0b2f4ac3be kill (subquery) - three years old bugfix that never worked 2006-03-06 18:26:39 +01:00
mskold@mysql.com
6feaef7517 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-06 18:08:42 +01:00
mskold@mysql.com
48cc86db83 Tables are now removed remotely by binlog_thread 2006-03-06 18:06:21 +01:00
msvensson@neptunus.(none)
77214de820 Disable rpl_ndb_multt_update2 2006-03-06 17:09:23 +01:00
msvensson@neptunus.(none)
6457050df6 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-06 14:52:49 +01:00
msvensson@neptunus.(none)
c9d14a0329 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-06 14:03:16 +01:00
msvensson@neptunus.(none)
30071e9783 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-06 14:01:15 +01:00
pekka@mysql.com
5d026c1d11 ndb - close non-bug rpl_ndb_charset Bug#17246 2006-03-06 13:51:57 +01:00
msvensson@neptunus.(none)
108fc10143 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-06 13:45:53 +01:00
bar@mysql.com
6823225a81 Merge mysql.com:/usr/home/bar/mysql-4.1.b15949 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-06 16:20:15 +04:00
msvensson@neptunus.(none)
fd47e2d19c BUG#10460 SHOW CREATE TABLE uses inconsistent upper/lower case 
- Fix result files
 2006-03-06 12:58:54 +01:00
gluh@mysql.com
7f4b27cf29 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-03-06 15:58:16 +04:00
msvensson@devsrv-b.mysql.com
ee97bebc8c Merge bk-internal:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
 2006-03-06 12:28:30 +01:00
msvensson@neptunus.(none)
6ffe593ddc Fix merge error, missing "," in result file 2006-03-06 12:21:42 +01:00
kent@mysql.com
ff71af1e01 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-03-06 12:21:10 +01:00
kent@mysql.com
dfae81d014 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-03-06 12:15:26 +01:00
gluh@mysql.com
321eb3dce6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-03-06 15:15:23 +04:00
gluh@eagle.intranet.mysql.r18.ru
f3ce98d2c9 post-merge fix 2006-03-06 15:14:15 +04:00
msvensson@devsrv-b.mysql.com
2660607096 Merge devsrv-b.mysql.com:/space/magnus/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
 2006-03-06 12:04:54 +01:00
msvensson@neptunus.(none)
3f935b2777 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-06 12:00:51 +01:00
msvensson@neptunus.(none)
e4705ea4bf Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-06 11:51:46 +01:00