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

1125 commits

Author SHA1 Message Date
baker@bk-internal.mysql.com
343e08391d Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-09-16 07:19:42 +02:00
brian@zim.(none)
7194b6d75a This changes the order of the universe, black is now the new white. 
In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database.
 2006-09-15 10:28:00 -07:00
msvensson@shellback.(none)
f1e91ec7f7 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 17:00:09 +02:00
tsmith/tim@siva.hindu.god
2c67b7cecd Post-merge fix: remove dup() call in ha_archive.cc which resulted in a memory leak. 2006-09-14 14:59:14 -06:00
tsmith/tim@siva.hindu.god
52c01e88d4 Post-merge fixes: 
- Remove extra EXTRA_DIST from several Makefile.ams
- Add dummy primary key to test table in loaddata_autocom.inc
 2006-09-13 15:37:35 -06:00
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
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
brian@zim.(none)
7cc71499db Fix for a compile problem in Windows. 2006-09-07 12:34:12 -07:00
brian@zim.(none)
5e46ea7f03 Moves Innodb handler to the Innodb storage directory. 2006-09-07 08:23:58 -07: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
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
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
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
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
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
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
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
jonas@perch.ndb.mysql.com
8fb56fbc3a ndb - 
Snapup testBackup XXXerror
 2006-08-28 15:55:30 +02:00
jonas@perch.ndb.mysql.com
802990e139 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-08-28 10:27:02 +02:00
jonas@perch.ndb.mysql.com
b3ee645364 ndb - autotest 
adopt to new error code 755 (invalid tablespace)
 2006-08-28 08:32:14 +02:00
brian@zim.(none)
7216b5bc7a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/arch-5.1
 2006-08-25 14:07:30 -07:00
brian@zim.(none)
e831273902 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/arch-5.1
 2006-08-25 13:32:06 -07:00
brian@zim.(none)
baa914e66d Cleanup of unused variables. 
Fixed "discover" in the handler API.

Fixed problem where handlerton was not zero'ed. I need to look around, I suspect this problem is more widespread.
 2006-08-25 13:31:15 -07:00
jonas@perch.ndb.mysql.com
97a956ca73 ndb - fix some bug in testSRBank 2006-08-25 16:47:31 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
aeea252b4d no longer need ifdef as plugin is conditionally compiled 2006-08-25 00:37:01 -07:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
b68f0437e7 fix for windows build 2006-08-24 22:10:55 -07:00