mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31848 commits 2791 branches 343 tags 1.7 GiB
Commit graph

31848 commits

This branch
This branch
All branches
Author SHA1 Message Date
mskold@mysql.com
fb3286312f Reverted to previous error codes, since some common tests depend in it 2006-03-10 09:57:00 +01:00
mikael@zim.(none)
0d54bc885f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug17947
 2006-03-10 00:51:13 -08:00
mskold@mysql.com
596f2ae03e 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-10 09:44:23 +01:00
msvensson@neptunus.(none)
ed50702744 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-10 08:16:21 +01:00
tomas@poseidon.ndb.mysql.com
fb631aa412 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-10 07:10:28 +01:00
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
brian@zim.(none)
469893066b Fixed portability issue in 5.1 to include parsers from other applications. 2006-03-09 17:37:59 -08:00
brian@zim.(none)
e2ce8b2132 Merge zim.(none):/home/brian/mysql/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.1-new
 2006-03-09 17:06:04 -08:00
brian@zim.(none)
579271a461 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2006-03-09 16:49:01 -08:00
brian@zim.(none)
eefd1207bb This patch does 1) fix my build breakage 2) Complete the removal of all symbols which could clash with another parser. 2006-03-09 16:44:08 -08:00
tomas@poseidon.ndb.mysql.com
139af836ab 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 23:17:08 +01:00
tomas@poseidon.ndb.mysql.com
21f5e9f351 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 23:06:51 +01: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
msvensson@neptunus.(none)
8511dd9ae5 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-09 21:09:37 +01:00
msvensson@neptunus.(none)
6d3f51928c Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-09 21:09:32 +01:00
evgen@sunlight.local
3155af91fe Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into sunlight.local:/work_local/17726-bug-5.1-new-mysql
 2006-03-09 22:55:26 +03:00
tomas@poseidon.ndb.mysql.com
f241771a3b 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 20:49:10 +01:00
tomas@poseidon.ndb.mysql.com
b14c7abac2 ndb: store event operations per gci 2006-03-09 20:47:19 +01: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
mskold@mysql.com
7d4ed3028a Added more tests for bug#18040: Create unique index cause error 4243 2006-03-09 20:08:30 +01:00
mikael@zim.(none)
abc1816dc2 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug17947
 2006-03-09 10:51:49 -08: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
mikael@zim.(none)
da431d48c9 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug17947
 2006-03-09 10:29:17 -08:00
mikael@zim.(none)
eed9568833 BUG#17947: Crash when REBUILD PARTITION syntax error 2006-03-09 10:19:25 -08:00
evgen@moonbone.local
349c39ceff Merge moonbone.local:/work/17726-bug-5.0-mysql 
into moonbone.local:/work/17726-bug-5.1-new-mysql
 2006-03-09 21:17:25 +03:00
msvensson@neptunus.(none)
ad6b8f873b Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-09 19:09:53 +01:00
brian@zim.(none)
78abb2d117 Porting fix that allows others to include compiled code with different parsers. 
Makes you wonder what I am up to, doesn't?
 2006-03-09 10:09:52 -08:00
msvensson@neptunus.(none)
483f53b440 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-09 19:06:15 +01: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
mskold@mysql.com
5c9500438e 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-09 17:45:51 +01:00
mskold@mysql.com
5ebe4f37c4 Changed error code mapping for unique constraint violation 2006-03-09 17:44:37 +01:00
mskold@mysql.com
adb6c4debb bug#18040 - ndb online index build 2006-03-09 17:42:35 +01: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
lars@mysql.com
70d467e89a Test fixes 2006-03-09 16:30:59 +01:00
lars@mysql.com
6bcac9fcc6 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats
 2006-03-09 16:12:58 +01:00
lars@mysql.com
418a8656d9 Fix to not replicate mysql.event table 
Test fixes
 2006-03-09 15:59:29 +01:00
msvensson@neptunus.(none)
8bd2c37d20 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-09 15:51:57 +01:00
pekka@mysql.com
bdd57aeee0 ndb - bug#18067 [possibly partial] fix 2006-03-09 15:51:56 +01:00
pekka@mysql.com
81141285c0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-03-09 15:51:55 +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
tomas@poseidon.ndb.mysql.com
280e2bf440 Bug #18106 Ndb: Online add index together with replication may cause mysqld core 2006-03-09 15:50:26 +01:00
msvensson@neptunus.(none)
686c8eb001 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-09 15:49:32 +01:00