mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38170 commits 2784 branches 343 tags 1.6 GiB
Commit graph

38170 commits

This branch
This branch
All branches
Author SHA1 Message Date
lars/lthalmann@dl145j.mysql.com
0f85f6f760 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-21 00:53:47 +02:00
lars/lthalmann@dl145j.mysql.com
57a74ea4af Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-21 00:23:20 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
d20e326504 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-21 00:05:56 +02:00
acurtis/antony@ltamd64.xiphis.org
9706e6a8ab Merge xiphis.org:/home/antony/work2/p2-bug22417.1 
into  xiphis.org:/home/antony/work2/p2-bug22417.2
 2006-09-20 11:36:07 -07:00
mskold/marty@mysql.com/linux.site
9707d43cc3 bug#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,: Updated reslt file 2006-09-20 20:04:58 +02:00
mskold/marty@linux.site
d6d0208dfb Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-20 16:49:06 +02:00
mskold/marty@mysql.com/linux.site
99a4f96535 Bug#18976 CRBR: multiple binlog, second binlog may miss schema log events:Change test back to verify again 2006-09-20 16:46:54 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
0c03f9348d Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-09-20 16:17:30 +02:00
istruewing@chilla.local
77d610c2b4 Merge chilla.local:/home/mydev/mysql-5.1--team 
into  chilla.local:/home/mydev/mysql-5.1-tomain
 2006-09-20 14:36:32 +02:00
istruewing@chilla.local
1782889d35 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
 2006-09-20 08:33:46 +02:00
stewart@willster.(none)
6a98b6c39e Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
 2006-09-20 15:27:45 +10:00
brian@zim.(none)
63d78a7659 Removed ifdef need. 
Cleaned up test to no longer need have_
 2006-09-19 13:58:12 -07:00
mskold/marty@mysql.com/linux.site
b98987db17 C style comments 2006-09-19 15:18:43 +02:00
istruewing@chilla.local
c49c58cbf4 Merge chilla.local:/home/mydev/mysql-5.0-bug14400-monty 
into  chilla.local:/home/mydev/mysql-5.1-bug14400-monty
 2006-09-19 14:33:29 +02:00
istruewing@chilla.local
7419f50245 After merge fix. 2006-09-19 14:26:18 +02:00
mats@romeo.(none)
0d019e0380 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
 2006-09-19 13:47:15 +02:00
mskold/marty@linux.site
e3c7886768 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-19 11:34:03 +02:00
mskold/marty@mysql.com/linux.site
e8abf51de1 Bug #18679 rpl_ndb_dd_advance.test fails randomly 2006-09-19 11:31:55 +02:00
istruewing@chilla.local
5d509b32d4 Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty 
into  chilla.local:/home/mydev/mysql-5.0-bug14400-monty
 2006-09-19 11:27:00 +02:00
stewart@willster.(none)
6ff9664d46 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
 2006-09-19 18:36:18 +10:00
istruewing@chilla.local
47dc3fbe8a Merge bk-internal:/home/bk/mysql-4.0 
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
 2006-09-19 10:17:25 +02:00
istruewing@chilla.local
3307d448ee Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0--team
 2006-09-19 09:26:42 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
98a8537adf Bug#22417 
"plug.in not included in dist source"
 2006-09-18 19:31:08 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
844df8f085 post merge fixes 2006-09-18 15:52:16 -07:00
acurtis/antony@ltamd64.xiphis.org
424857e0e4 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/engines-merge
 2006-09-18 12:16:03 -07:00
mats@romeo.(none)
78ad0eee91 Fixing and checking result for mysqldump test. 2006-09-18 21:09:48 +02:00
istruewing@chilla.local
418c1f30f8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0--team
 2006-09-18 21:02:47 +02:00
gkodinov@dl145s.mysql.com
ba7a873172 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
 2006-09-18 17:45:29 +02:00
svoj@april.(none)
bb859ecde4 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-18 20:45:04 +05:00
stewart@willster.(none)
49eb41e09d BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS, 
Change things around so that we add a row for each log file group that lists
the free space for that log file group.
 2006-09-19 01:44:32 +10:00
svoj@april.(none)
36be4318da Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-18 20:43:36 +05:00
svoj@may.pils.ru
43097593e3 Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2006-09-18 20:35:33 +05:00
georg@lmy002.wdf.sap.corp
df606b28b1 In current 5.1 build we don't build embedded server for windows (this will be 
fixed when 5.1-win will be pushed into main tree).
Commenting the libmysqld and libmysqld/example subdirectories will allow us 
to upgrade from cmake 2.2 to 2.4.
 2006-09-18 17:28:17 +02:00
gkodinov@dl145s.mysql.com
809d1cfe2f Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
 2006-09-18 17:06:13 +02:00
gkodinov@dl145s.mysql.com
cf9d1c9152 Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-18 19:01:07 +04:00
mleich@three.local.lan
5f5d1507ec 1. Cumulated fix for Bug#22398, #22404 and #22405 
2. Correct some logical bugs within the tests, which were caused by
   automatic resolve of BitKeeper
 2006-09-18 16:55:56 +02:00
svoj@april.(none)
419a51c5a5 Merge april.(none):/home/svoj/devel/bk/mysql-5.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-18 19:43:33 +05:00
gkodinov@dl145s.mysql.com
c1035c210b Merge bk-internal:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
 2006-09-18 18:33:11 +04:00
gkodinov@dl145s.mysql.com
f1100c007d merge fixes 2006-09-18 18:30:51 +04:00
svoj@april.(none)
f53f015be6 Merge april.(none):/home/svoj/devel/bk/mysql-4.1-engines 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2006-09-18 16:25:18 +05:00
svoj@april.(none)
f21eadfc74 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2006-09-18 16:23:45 +05:00
mskold/marty@linux.site
dd1c43ba2a Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-18 13:11:03 +02:00
mskold/marty@mysql.com/linux.site
d1fd23b1c9 Bug #21378 Alter table from X storage engine to NDB could cause data loss: added show tables to ensure tables are gone 2006-09-18 13:00:21 +02:00
gkodinov@dl145s.mysql.com
ce8ed889d7 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
 2006-09-18 12:57:20 +02:00
gkodinov@dl145s.mysql.com
2ec485f06e Merge bk-internal:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-18 12:20:20 +02:00
gkodinov@dl145s.mysql.com
fae596aafd merge fixes 2006-09-18 12:14:27 +02:00
evgen@moonbone.local
f42385e0d1 disabled.def: 
Enabled rpl_sp_effects test due to fixed bug.
 2006-09-18 13:53:30 +04:00
gkodinov@dl145s.mysql.com
522823b5d3 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-18 11:19:40 +02:00
gkodinov@dl145s.mysql.com
fcf99e859f Merge bk-internal:/home/bk/mysql-4.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-09-18 11:09:56 +02:00
mskold/marty@linux.site
8ae0ff4cb9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-18 10:51:00 +02:00