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

1304 commits

Author SHA1 Message Date
svoj@april.(none)
7ed413d17b Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.1-engines
 2006-09-29 00:23:43 +05:00
brian@zim.(none)
bb09a2a940 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-28 11:25:02 -07:00
brian@zim.(none)
542cf080a4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-28 10:51:56 -07:00
cmiller@zippy.cornsilk.net
e72bc63906 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-28 10:15:32 -04:00
gkodinov@dl145s.mysql.com
41a2631cb3 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-28 14:53:31 +02:00
dli@dev3-76.dev.cn.tlan
273de17cce Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-19651
 2006-09-28 20:52:28 +08:00
gbichot@dl145h.mysql.com
7493331fa4 Merge gbichot@bk-internal:/home/bk/mysql-5.1-arch 
into  dl145h.mysql.com:/users/gbichot/mysql-5.1-arch
 2006-09-28 13:22:56 +02:00
gbichot@dl145h.mysql.com
041dedfcfb In the handlerton, cursor creation function don't have an argument 
and so the engine calls current_thd to derive transaction information;
instead we now pass THD to those functions, it looks more logical
(it makes the implicit current_thd parameter more visible).
Approved by Brian and Monty.
 2006-09-28 13:19:43 +02:00
gkodinov@dl145s.mysql.com
3abb604333 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-28 10:41:42 +02:00
petr/cps@owlet.local
64c2c0cb19 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new
 2006-09-28 04:44:55 +04:00
elliot/emurphy@lost.local
d5c98585da Merge mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gca 
into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1-new-maint
 2006-09-27 17:20:45 -04:00
svoj@april.(none)
9353e3cf73 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-27 18:58:23 +05:00
svoj@april.(none)
92d7d668df Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-27 15:29:04 +05:00
gkodinov/kgeorge@macbook.gmz
a01e7b12ce Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.1-opt
 2006-09-27 13:03:41 +03:00
brian@zim.(none)
f9a02811da Removed Field (this came in as an idea from a previous patch by Serg) 2006-09-26 21:26:04 -07:00
jonas@perch.ndb.mysql.com
b0b69bac4a Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-09-26 16:14:05 +02:00
jonas@perch.ndb.mysql.com
d6ae4c1748 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-09-26 15:33:03 +02:00
pekka@orca.ndb.mysql.com
c9e53b3f11 ndb - bug#21690: cleanup: set column properties in any order before create 2006-09-26 14:21:52 +02:00
jonas@perch.ndb.mysql.com
ea12fac469 ndb - post merge fixes... 2006-09-26 14:08:20 +02:00
jonas@perch.ndb.mysql.com
e609add790 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-09-26 13:58:34 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
f6129d68ce Bug#22080 
"CHECK fails to identify some corruption"
  change to allow it to detect more errors in data format
 2006-09-25 09:04:19 -07:00
cmiller@zippy.cornsilk.net
161fea4ac4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-23 09:51:20 -04:00
mskold/marty@linux.site
5e60232da9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-22 21:14:58 +02:00
gni/root@dev3-127.(none)
493e5ddbfa Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-ndb-bj 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21585
 2006-09-22 20:28:12 +08:00
gni/root@dev3-127.(none)
c26952192b BUG@21585 The --help option shows a screen of command options for the ndbd, ndb_mgmd, ndb_mgm 
and other commands related to ndb. For all of these, the help screen contains 
           "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.
 2006-09-22 20:22:50 +08:00
gni/root@dev3-127.(none)
6991a44d48 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug20575 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug20575
 2006-09-22 19:30:37 +08:00
msvensson@neptunus.(none)
015d8409a7 Fix windows and aix compile problem 
- Variables must be declared first in each block
 2006-09-22 09:00:23 +02:00
msvensson@shellback.(none)
0dbbe51384 Fix Solaris 10 compile failure 
- Void function can't return a value
 2006-09-21 20:37:35 +02:00
msvensson@shellback.(none)
fe0cfacf35 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-21 20:31:35 +02:00
tsmith/tim@siva.hindu.god
64d0cd0b74 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/inno/51-t
 2006-09-21 03:56:37 -06:00
tsmith/tim@siva.hindu.god
f269d9b6c3 Applied innodb-5.1 snapshots ss799 and ss854 
Bugs fixed:
- Bug #20877: InnoDB data dictionary memory footprint is too big
- Bug #13544: Second delete of same row in transaction illustrates non-optimal locking
- Bug #20791: valgrind errors in InnoDB
 2006-09-21 01:39:09 -06:00
istruewing@chilla.local
0aaf483734 Merge chilla.local:/home/mydev/mysql-5.1--main 
into  chilla.local:/home/mydev/mysql-5.1-tomain
 2006-09-21 09:37:31 +02:00
Justin.He/justin.he@qa3-104.qa.cn.tlan
a479482727 Merge qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0/bug21036-mysql-5.0 
into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-ndb-bj
 2006-09-21 10:22:20 +08:00
dli@dev3-76.dev.cn.tlan
3cf3a9211b Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-ndb-bj 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
 2006-09-20 18:56:38 +08:00
lzhou/root@dev3-138.dev.cn.tlan
aa6107031b BUG#21799 manual modify variable name. 2006-09-20 10:56:37 +00:00
Kristofer.Pettersson@naruto.
3599c87654 Merge kpettersson@bk-internal:/home/bk/mysql-5.1-maint 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-09-20 12:21:49 +02:00
Kristofer.Pettersson@naruto.
1db3f60248 Merge naruto.:C:/cpp/bug20789/my50-bug20789 
into  naruto.:C:/cpp/bug20789/my51-bug20789
 2006-09-20 07:40:56 +02:00
dli@dev3-76.dev.cn.tlan
2724451f83 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-20395 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
 2006-09-20 10:25:31 +08:00
lzhou/root@dev3-138.dev.cn.tlan
6180aada88 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21799 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21799
 2006-09-19 18:08:14 +00: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
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@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
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
gni/root@dev3-127.(none)
98941f7f18 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21530 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21530
 2006-09-18 14:14:08 +08:00
Kristofer.Pettersson@naruto.
8ec47c091e Merge naruto.:C:/cpp/bug20789/my50-bug20789 
into  naruto.:C:/cpp/mysql-5.1-new-maint
 2006-09-17 14:06:29 +02:00
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
istruewing@chilla.local
c62c1a54fa Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-toteam
 2006-09-15 17:21:38 +02: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
petr/cps@owlet.local
2fe744c878 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new
 2006-09-15 17:24:13 +04:00