brian@zim.(none)
8a56fcff6a
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-11-05 12:06:09 -08:00
brian@zim.(none)
1a92614216
Removed Innodb variable at request of Innobase.
2006-11-05 12:03:19 -08:00
anozdrin/alik@alik.
18fb4abff4
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2006-11-03 14:00:35 +03:00
cmiller@zippy.cornsilk.net
b074e13483
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-02 17:51:59 -05:00
cmiller@zippy.cornsilk.net
af5acac047
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-02 17:39:52 -05:00
malff/marcsql@weblab.(none)
48a87f8ae0
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-21114_b
2006-11-02 11:13:04 -07:00
malff/marcsql@weblab.(none)
62c242cc75
Bug#21114 (Foreign key creation fails to table with name format)
...
Due to the complexity of this change, everything is documented in WL#3565
This patch is the third iteration, it takes into account the comments
received to date.
2006-11-02 11:01:53 -07:00
baker@bk-internal.mysql.com
5214ed48e7
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-02 08:35:55 +01:00
kostja@bodhi.local
965669d1f9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-02 03:24:11 +03:00
kostja@bodhi.local
6a28c436f7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-02 01:08:39 +03:00
monty@nosik.monty.fi
d745fe49fe
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-01 19:46:23 +02:00
monty@mysql.com/nosik.monty.fi
ca99516cc7
Fixed a lot of compiler warnings (Mainly in mysqld and instance manager)
...
Fixed some possible fatal wrong arguments to printf() style functions
Initialized some not initialized variables
Fixed bug in stored procedure and continue handlers
(Fixes Bug#22150)
2006-11-01 19:41:09 +02:00
brian@zim.(none)
31e47a9511
Adding in an ha_end() call. This is the first part of the patch I and Monty have agreed on. In the future engines will have the option of shutting down more quickly via the panic call, or just shutting down during the unloading of a plugin.
2006-10-31 20:10:32 -08:00
msvensson@shellback.(none)
1d5abe60ff
Bug#22958 Com_create_user missing within 5.0
...
- Add Com_create_user to SHOW STATUS command
2006-10-30 15:59:47 +01:00
kroki/tomash@moonlight.intranet
cf99db484e
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21915
2006-10-30 17:57:45 +03:00
kroki/tomash@moonlight.intranet
1c87434699
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
2006-10-30 17:51:36 +03:00
kroki/tomash@moonlight.intranet
1bfe00e0da
BUG#21915: Changing limits of table_cache when setting max_connections
...
If the user has specified --max-connections=N or --table-open-cache=M
options to the server, a warning could be given that some values were
recalculated, and table-open-cache could be assigned greater value.
Note that both warning and increase of table-open-cache were totally
harmless.
This patch fixes recalculation code to ensure that table-open-cache will
be never increased automatically and that a warning will be given only if
some values had to be decreased due to operating system limits.
No test case is provided because we neither can't predict nor control
operating system limits for maximal number of open files.
2006-10-30 17:47:02 +03:00
msvensson@shellback.(none)
5a049ba807
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-30 13:45:24 +01:00
msvensson@shellback.(none)
e8c7f19179
Improve comments around FLUSH STATUS
...
It's not possible to flush the global status variables in 5.0
Update test case so it works by recording the value of handle_rollback
before and compare it to the value after
2006-10-30 13:35:57 +01:00
jani@ua141d10.elisa.omakaista.fi
8dd0b2d0ae
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string
2006-10-17 19:54:44 +03:00
jani@ua141d10.elisa.omakaista.fi
02f29377fd
Changed several char* to LEX_STRING*.
2006-10-16 19:57:33 +03:00
pekka@orca.ndb.mysql.com
e52bd4be2b
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-bug21191
2006-10-15 12:11:52 +02:00
brian@zim.(none)
5c4a6807c1
Panic was being called twice!
...
Both on its own and in the plugin shutdown.... not so good. The code is a bit simpler, and we could now technically remove the panic all entirely if we wanted to.
2006-10-11 18:02:12 -07:00
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
brian@zim.(none)
56505c01f9
This patch updates to remove most global hton needs. Cleans up wrong message in partition.
2006-09-30 18:31:13 -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
jimw@rama.(none)
7a23b1baf7
Merge rama.(none):/home/jimw/my/mysql-5.0-clean
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-09-28 20:20:33 -07:00
jimw@rama.(none)
caf4392f71
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into rama.(none):/home/jimw/my/mysql-4.1-clean
2006-09-28 18:11:29 -07:00
jimw@rama.(none)
68eadc8a79
Merge rama.(none):/home/jimw/my/mysql-4.1-clean
...
into rama.(none):/home/jimw/my/mysql-5.0-clean
2006-09-28 18:09:10 -07:00
lars/lthalmann@dl145j.mysql.com
57a74ea4af
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-21 00:23:20 +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
cmiller@zippy.cornsilk.net
66808ead4e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-15 18:18:18 -04:00
brian@zim.(none)
f79ddec1f2
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-09-15 10:48:30 -07: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)
2b79a6bc36
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-15 14:28:25 +02:00
msvensson@shellback.(none)
c4177ec484
Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown
2006-09-15 14:27:45 +02:00
lars/lthalmann@dl145j.mysql.com
a3adcfe52d
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-15 01:46:47 +02:00
dlenev@mockturtle.local
5ba1b83c98
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
2006-09-14 23:53:35 +04:00
pekka@orca.ndb.mysql.com
94e17bd6b3
ndb - bug#21191: ndb-index-stat-enable: one more suspicious default
2006-09-13 12:46:26 +02:00
pekka@orca.ndb.mysql.com
b6e2989cf8
ndb - bug#21191: ndb index stats OFF by default
2006-09-13 12:27:48 +02:00
lars/lthalmann@dl145j.mysql.com
1dfc84986e
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-11 13:34:44 +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
andrey@example.com
83f4f3b2aa
fix build
2006-09-08 00:49:37 +02:00
tsmith@maint1.mysql.com
330fb6a3be
Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx
...
into maint1.mysql.com:/data/localhome/tsmith/bk/50
2006-09-07 01:20:03 +02:00
tsmith@maint1.mysql.com
8b5f66767f
Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx
...
into maint1.mysql.com:/data/localhome/tsmith/bk/41
2006-09-07 01:14:54 +02:00
tsmith@maint1.mysql.com
8991a269f1
Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx
...
into maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx
2006-09-07 01:07:24 +02:00
tsmith@maint1.mysql.com
b5f67a642f
Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx
...
into maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx
2006-09-07 00:59:08 +02:00
tsmith@maint1.mysql.com
b6cd727ed1
Bug #21054 : myisam_stats_method ignored in my.cnf and cmdline
...
Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up
2006-09-07 00:11:43 +02:00
ahristov@bk-internal.mysql.com
75eeececb1
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337
2006-09-06 14:35:27 +02:00
cmiller@zippy.cornsilk.net
298917eb5b
Fix bad manual merge.
2006-09-05 16:28:31 -04:00