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

1246 commits

Author SHA1 Message Date
tsmith@maint2.mysql.com
6a31ec2cad Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
 2006-09-13 09:03:52 +02:00
msvensson@neptunus.(none)
7b7e66763c Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work 2006-09-12 16:43:57 +02:00
msvensson@neptunus.(none)
f6ce081f6a Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-12 16:13:00 +02:00
msvensson@neptunus.(none)
4ae7c5a429 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-12 14:49:41 +02:00
Kristofer.Pettersson@naruto.
53bb0bdcda Merge naruto.:C:/cpp/bug20789/my50-bug20789 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-09-12 14:34:01 +02:00
pekka@orca.ndb.mysql.com
a2928a35d8 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20612
 2006-09-11 08:45:22 +02:00
pekka@orca.ndb.mysql.com
8e88d8d54f ndb - bug#20612 ins-del fix in tup 2006-09-10 21:58:51 +02:00
msvensson@shellback.(none)
e03a0617a0 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-08 16:01:51 +02:00
brian@zim.(none)
aa52207c11 Warning fixes for Windows, and an include fix for Windows for Innodb. 2006-09-07 16:17:16 -07:00
istruewing@chilla.local
aeae764e64 Merge chilla.local:/home/mydev/mysql-5.0-bug14400 
into  chilla.local:/home/mydev/mysql-5.1-bug14400
 2006-09-07 22:07:52 +02:00
brian@zim.(none)
7cc71499db Fix for a compile problem in Windows. 2006-09-07 12:34:12 -07:00
knielsen@ymer.(none)
eac6374a88 Fix compilation errors in gcc -ansi -pedantic. 2006-09-07 21:00:00 +02:00
brian@zim.(none)
5e46ea7f03 Moves Innodb handler to the Innodb storage directory. 2006-09-07 08:23:58 -07:00
knielsen@ymer.(none)
273f189971 Merge bk-internal:/home/bk/mysql-5.1-new-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.1-ndb-pbsu
 2006-09-07 15:25:59 +02:00
knielsen@ymer.(none)
f8f1b203e5 NDB temporary tables. 
Temporary tables are not written to disk by DDL operations. This makes
DDL much faster (useful for tests), but tables are lost after system
restart.

New commit, since this feature will not be available in 5.1.
 2006-09-07 15:09:34 +02:00
brian@zim.(none)
1ac47c9513 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/tmp/merge-5.1
 2006-09-06 09:23:47 -07:00
guilhem@gbichot3.local
21c915a003 mi_test_all.sh needs "./" before the executable names otherwise they 
are not found
 2006-09-06 15:05:19 +02:00
pekka@orca.ndb.mysql.com
bf24f687e8 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-09-06 10:21:11 +02:00
cmiller@zippy.cornsilk.net
02b40b04e6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:28:12 -04:00
gni/root@dev3-127.(none)
9438d22c12 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug21033
 2006-09-05 16:07:35 +08:00
tsmith@maint1.mysql.com
c488e4b928 Applied InnoDB 5.1 snapshot ss787. 
Bugs fixed:
- Bug #20791    valgrind errors in InnoDB
  Remove Valgrind warning of Bug #20791 : in new database
  creation, we read the doublewrite buffer magic number from
  uninitialized memory; the code worked because it was extremely
  unlikely that the memory would contain the magic number
- Bug #21784    DROP TABLE crashes 5.1.12-pre if concurrent
  queries on the table
  remove update_thd() in ::store_lock()


Also includes numerous coding style fixes, etc.  See file-level
comments for details.
 2006-09-05 03:52:15 +02:00
tsmith@maint2.mysql.com
5f5cb7d1f6 Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51 
into  maint2.mysql.com:/data/localhome/tsmith/bk/51
 2006-09-04 23:05:17 +02:00
lzhou/root@dev3-138.dev.cn.tlan
dc2efd51f7 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21128 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21128
 2006-09-04 18:23:32 +00:00
jonas@perch.ndb.mysql.com
81f9676de6 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-09-03 17:55:01 +02:00
pekka@orca.ndb.mysql.com
2534153973 ndb - bug#21754 ndb api events: fix sizes for blobs + remove expensive loop 2006-09-03 16:13:59 +02:00
jonas@perch.ndb.mysql.com
16a32bc211 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-09-03 11:31:51 +02:00
jonas@perch.ndb.mysql.com
5a78db3ddc ndb - 
fix ndb-violations of strict aliasing found by gcc4.1
  (crashes in ndb_dd_*)
 2006-09-03 11:11:37 +02:00
jonas@perch.ndb.mysql.com
6d715dead0 ndb - 
gcc-4.1.1 work-around for bug in strict-aliasing
 2006-09-03 10:57:34 +02:00
pekka@orca.ndb.mysql.com
454d545473 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-09-02 05:23:04 +02:00
mskold/marty@mysql.com/linux.site
ccd3e89525 Added missing return 2006-09-01 20:56:34 +02:00
brian@zim.(none)
c7baf60267 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/tmp/mysql-5.1-arch
 2006-09-01 09:19:10 -07:00
mskold/marty@linux.site
04a62eb684 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-01 15:26:03 +02:00
mskold/marty@mysql.com/linux.site
8fdc781d39 Fixed ndbapi-examples, and added tests for mysql-test-run.pl 2006-09-01 15:14:50 +02:00
evgen@moonbone.local
e1c245bff3 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt 
into  moonbone.local:/work/tmp_merge-5.1-mysql
 2006-09-01 14:08:38 +04:00
dli@dev3-76.dev.cn.tlan
ac481a3206 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-21345
 2006-09-01 10:36:32 +08:00
brian@zim.(none)
b5fdcc2962 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/tmp/mysql-5.1-arch
 2006-08-31 16:11:57 -07:00
gni/root@dev3-127.(none)
2b94b80661 BUG#21033 The error log of mysqld shows useless information, and hides the real error. 2006-08-31 18:29:23 +08:00
pekka@orca.ndb.mysql.com
2da1333a61 ndb - bug#21690 workaround-fix, cleanup in separate patch 2006-08-31 10:54:34 +02:00
evgen@moonbone.local
94028c618f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
 2006-08-31 12:14:27 +04:00
cmiller@zippy.cornsilk.net
d575196c35 Manual merge. 2006-08-30 21:26:43 -04:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
38a59efbc9 add 2 placeholder values for config and system variables. 2006-08-30 14:27:29 -07:00
mskold/marty@mysql.com/linux.site
6bac3b8f40 NDBAPI cleanup 2006-08-30 11:41:21 +02:00
jonas@perch.ndb.mysql.com
365b69dc7f Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-29 22:56:23 +02:00
evgen@moonbone.local
8cf9781717 Merge moonbone.local:/work/tmp_merge-5.0-mysql 
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
 2006-08-29 18:58:50 +04:00
jonas@perch.ndb.mysql.com
853cf3dac4 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-29 09:20:09 +02:00
jonas@perch.ndb.mysql.com
b6e908ca29 ndb - 
fix backup/lcp race
 2006-08-29 09:19:41 +02:00
gni/root@dev3-127.(none)
49e96f3bc9 Merge dev3-127.(none):/mnt/mysql/home/ngb/bug19873 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19873
 2006-08-29 13:43:04 +08:00
gni/root@dev3-127.(none)
dd82086f67 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
 2006-08-29 11:04:51 +08:00
tnurnberg@salvation.intern.azundris.com
499553365e Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
 2006-08-28 19:30:58 +02:00
jonas@perch.ndb.mysql.com
6011ad7868 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-28 16:03:51 +02:00