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

8616 commits

Author SHA1 Message Date
cmiller@calliope.local
34a74d65ba Merge calliope.local:/Users/cmiller/work/src/mysql-5.1-new 
into  calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump
 2006-03-09 22:23:35 -05:00
cmiller@calliope.local
9747057fa9 Merge calliope.local:/Users/cmiller/work/src/mysql-5.1-new 
into  calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump
 2006-03-09 15:22:11 -05:00
cmiller@calliope.local
d3c0dc0eed Added code to mysqldump to dump timed events when instructed to do so, with 
the '-E' or '--events' flag.  (Closes Bug#16853 and Bug#17714.)


WARNING:

At present, these tests fail due to b*g number 18078.
 2006-03-09 15:12:43 -05:00
paul@snake-hub.snake.net
0ecec577fc Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-03-09 13:18:13 -06:00
paul@snake-hub.snake.net
d59d62c5dc mysqltest.test: 
Fix typos.
 2006-03-09 13:17:19 -06:00
brian@zim.(none)
e5161fb802 Merge zim.(none):/home/brian/mysql/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.1-new
 2006-03-09 10:39:40 -08:00
anozdrin@mysql.com
c5895a9686 After-merge fixes. 2006-03-09 21:00:45 +03:00
anozdrin@mysql.com
c1ef46fcc7 Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-tree 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged
 2006-03-09 20:41:21 +03:00
pekka@mysql.com
c824a4095d Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-03-09 17:20:33 +01:00
jmiller@mysql.com
eabdcb34ba Cleanup 2006-03-09 17:19:39 +01:00
pekka@mysql.com
09ea958717 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-03-09 17:18:16 +01:00
pekka@mysql.com
6e07985293 ndb - bug#18067 bug#18075 closes these bugs 2006-03-09 17:16:04 +01:00
jmiller@mysql.com
f01668afd3 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-03-09 17:15:40 +01:00
jmiller@mysql.com
aca1b9d766 rpl_ndb_dd_advance.result: 
Updated results
rpl_ndb_dd_advance.test:
  Updated test case from comments in Tomas's review
  Changes bug number comment
 2006-03-09 17:14:33 +01:00
tomas@poseidon.ndb.mysql.com
6c1b0b37b6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-09 15:51:54 +01:00
evgen@moonbone.local
3d37ec6b8b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/17726-bug-5.0-mysql
 2006-03-09 14:07:34 +03:00
msvensson@neptunus.(none)
e4bdc16f2e Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137
 2006-03-09 12:02:29 +01:00
msvensson@neptunus.(none)
80c8ba2fe7 Make test case run only for statement logging 2006-03-09 12:00:12 +01:00
bar@mysql.com
8c2fb88a8f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new/ 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16318
 2006-03-09 11:53:56 +04:00
msvensson@neptunus.(none)
bdb10d3ffd Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137
 2006-03-09 08:15:09 +01:00
holyfoot@mysql.com
597fe4b178 Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-03-09 10:38:41 +04:00
holyfoot@mysql.com
481dc5b7e5 Merge bk@192.168.21.1:mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.mrg
 2006-03-09 10:21:58 +04:00
jmiller@mysql.com
d721e51764 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-03-09 04:22:19 +01:00
jmiller@mysql.com
e517d40a43 New test to satisfy some of the 5.1 CR test plan 2006-03-09 03:37:25 +01:00
tomas@poseidon.ndb.mysql.com
610aa1e07c Bug #17838 binlog not setup on seconday master after rename 
-added setting up of binlogging after receiving rename table
+cleanup
 2006-03-09 01:04:13 +01:00
tomas@poseidon.ndb.mysql.com
696c76778a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-08 15:33:15 +01:00
tomas@poseidon.ndb.mysql.com
ed1f9a3402 Bug #17812 Previous lock table for write causes "stray" lock although table is recreated 
- only set table share version to 0 (zero) on global invalidation
 2006-03-08 14:45:09 +01:00
holyfoot@mysql.com
b5fc0db76d Merge mysql.com:/home/hf/work/mysql-5.0.mrg 
into mysql.com:/home/hf/work/mysql-5.1.mrg
 2006-03-08 17:16:43 +04:00
msvensson@neptunus.(none)
59f505f01d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137
 2006-03-08 13:33:00 +01:00
msvensson@neptunus.(none)
7f0eba7081 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
 2006-03-08 13:31:05 +01:00
msvensson@neptunus.(none)
fed1479d27 Merge neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137
 2006-03-08 10:44:43 +01:00
msvensson@neptunus.(none)
8c3be395f7 After merge 2006-03-08 10:40:29 +01:00
msvensson@neptunus.(none)
8a977e4b38 Merge neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
 2006-03-08 10:17:12 +01:00
msvensson@neptunus.(none)
8162610a39 Bug#17137 Running "truncate table" on temporary table leaves the table open on a slave 
- Decrease "slave_open_temp_tables" during reopen of truncated table.
 - Add test "rpl_trunc_temp"
 2006-03-08 10:15:48 +01:00
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
anozdrin@mysql.com
615357b96c After-merge fix: fix the test case for BUG#16266 to query 
only its own tables to prevent getting tables from others.
 2006-03-08 00:13:27 +03: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
anozdrin@mysql.com
d9d4dc5ef8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
 2006-03-07 14:28:09 +03: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