msvensson@neptunus.(none)
ca21b57992
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-03 09:28:44 +02:00
svoj@april.(none)
115c4fe8dc
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2006-10-02 15:11:08 +05:00
baker@bk-internal.mysql.com
8a5fef1419
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-10-01 22:31:04 +02:00
holyfoot/hf@deer.(none)
5edde5a859
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/21888/my51-21888
2006-10-01 15:21:06 +05:00
brian@zim.(none)
4117860ec6
Merge zim.(none):/home/brian/mysql/merge-5.1
...
into zim.(none):/home/brian/mysql/arch-5.1
2006-09-30 18:44:42 -07:00
brian@zim.(none)
46ae2113ba
This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
...
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
2006-09-30 12:49:46 -07:00
gkodinov@dl145s.mysql.com
869d1a6a1d
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-09-30 09:35:11 +02:00
brian@zim.(none)
a756fd36ef
This removes the passing of global hton to engine instance.
2006-09-29 17:19:02 -07:00
tsmith/tim@siva.hindu.god
44f0e55ca4
Merge siva.hindu.god:/usr/home/tim/m/bk/50
...
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
2006-09-29 18:04:34 -06:00
tsmith/tim@siva.hindu.god
ca1f99bdb8
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
2006-09-29 17:01:16 -06:00
holyfoot/hf@deer.(none)
7392296414
Merge mysql.com:/home/hf/work/21888/my50-21888
...
into mysql.com:/home/hf/work/21888/my51-21888
2006-09-29 17:58:36 +05:00
istruewing@chilla.local
8655a80cda
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-bug22384
2006-09-29 09:29:37 +02:00
istruewing@chilla.local
d56f3c3398
Merge chilla.local:/home/mydev/mysql-5.0-bug22384
...
into chilla.local:/home/mydev/mysql-5.1-bug22384
2006-09-28 21:55:03 +02: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
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
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
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
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
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
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
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
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
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
petr/cps@mysql.com/owlet.local
f6663df6d8
Post-review fixes for
...
Bug #18559 "log tables cannot change engine, and
gets deadlocked when dropping w/ log on":
1) Add more generic error messages
2) Add new handlerton flag for engines, which support
log tables
3) Remove (log-tables related) mutex lock in myisam to
improve performance
2006-09-15 13:07:23 +04:00
istruewing@chilla.local
22d8c89d6e
Merge chilla.local:/home/mydev/mysql-5.1--main
...
into chilla.local:/home/mydev/mysql-5.1-toteam
2006-09-14 21:44:17 +02:00
istruewing@chilla.local
5e7db2ad06
Merge chilla.local:/home/mydev/mysql-5.0-bug14400
...
into chilla.local:/home/mydev/mysql-5.1-bug14400
2006-09-14 18:12:53 +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
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
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
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
brian@zim.(none)
b518763728
This changest:
...
Plugins now when compiled or not compiled work correctly with status variables.
Status variables from plugins now set their own names (removed bit where plugin name was pre-appended this broke Innodb and Cluster)
A few Makefile cleanups.
2006-08-22 16:24:12 -07:00
brian@zim.(none)
f68ce0ddef
This changeset moves the ha_myisam files to their storage directories. It also includes updates for all engines include patch for windows builds.
2006-08-19 17:38:42 -07:00
brian@zim.(none)
3d09079e31
Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed.
2006-08-18 21:19:19 -07:00
brian@zim.(none)
41f920b013
Merge zim.(none):/home/brian/mysql/dep-5.1
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-14 21:26:33 -07:00
brian@zim.(none)
8deb5beb9c
Merge zim.(none):/home/brian/mysql/dep-5.0
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-08-14 15:24:29 -07:00
brian@zim.(none)
4d7f7fb878
Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB.
2006-08-14 14:45:48 -07:00
brian@zim.(none)
af443c2dd8
Fixed warning message breakage.
...
Fixed install breakage (my own fault)
Edited exampled cnf to remove bdb references.
2006-08-13 22:28:41 -07:00
patg@govinda.patg.net
4371749996
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
2006-08-10 14:28:39 -07:00
kroki/tomash@moonlight.intranet
e79876362e
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-rt-merge
2006-08-09 16:42:21 +04:00