msvensson@neptunus.(none)
75de30a31f
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-11-28 19:12:05 +01:00
msvensson@neptunus.(none)
6de56b75b2
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 19:11:02 +01:00
msvensson@neptunus.(none)
a92c7700bb
Only force mysqld to use log file up until 5.1.6
...
After that it will by default use log tables. That setting can be overruled
by adding a -master.opt file like mysql_client_test has.
2006-11-28 19:10:39 +01:00
msvensson@neptunus.(none)
d1d93f7412
Fix spelling error reported by Paul
2006-11-28 17:13:38 +01:00
msvensson@neptunus.(none)
a4571e29d5
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 16:25:41 +01:00
msvensson@neptunus.(none)
e5ff9ebcd8
Add warnings and more error checks in the creation of vardirs
2006-11-28 16:22:59 +01:00
msvensson@neptunus.(none)
0e58c1ab46
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 15:52:18 +01:00
msvensson@neptunus.(none)
acf75687fb
Some more checks to avoid removing unwanted directories.
2006-11-28 15:51:52 +01:00
msvensson@neptunus.(none)
bccf144260
No need to have a "created_by_mem" file, just read the link and
...
if that is same as opt_mem it can be removed
2006-11-28 15:39:23 +01:00
msvensson@neptunus.(none)
fc1f9bfede
Rename function datadir_setup to datadir_list_setup to avoid mixup
...
with the function where vardir's are created
2006-11-28 15:15:01 +01:00
msvensson@neptunus.(none)
7239e6133a
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 13:57:38 +01:00
msvensson@neptunus.(none)
896adf77ae
Bug#24354 option "--extern" of mysql-test-run.pl does not work anymore
...
- Better control of when to create/remove vardir
2006-11-28 13:57:07 +01:00
msvensson@neptunus.(none)
90d654646b
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 12:39:22 +01:00
msvensson@neptunus.(none)
afe91a26c6
Fix problem with mysqladmin logging to var/log before var has been created
...
And if var/ has been created, it will be recreated later so the logs
from "mtr_kill_leftovers" will be lost anyway
2006-11-28 12:36:26 +01:00
msvensson@neptunus.(none)
d1ed2e21b8
Backport of patch for bug#24471
2006-11-28 12:33:36 +01:00
msvensson@neptunus.(none)
8a0761201a
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 11:50:48 +01:00
ramil/ram@myoffice.izhnet.ru
2469ca2144
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug21587/my51-bug21587
2006-11-28 13:54:55 +04:00
ramil/ram@myoffice.izhnet.ru
25b5024571
Merge mysql.com:/usr/home/ram/work/bug21587/my50-bug21587
...
into mysql.com:/usr/home/ram/work/bug21587/my51-bug21587
2006-11-28 13:49:43 +04:00
tsmith/tim@siva.hindu.god
37d1d86d9f
raise max_connections default to avoid conflicts with apache max_childs settings (Bug #23883 )
2006-11-27 15:01:14 -07:00
jpipes@shakedown.(none)
03a5dcd7ce
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
2006-11-27 14:58:57 -05:00
jpipes@shakedown.(none)
7c7b1ede76
Merge shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
...
into shakedown.(none):/home/jpipes/dev/mysql-5.1-new-maint2
2006-11-27 14:46:48 -05:00
msvensson@neptunus.(none)
76b8b450d6
Fix for rpl000015 that fails if $MYSQL_TCP_PORT is set. The default value for
...
master_port after a "change master" will be set to the compiled in default value
i.e not always the same as what the master report as it's port number.
2006-11-27 19:56:04 +01:00
msvensson@neptunus.(none)
e09616e1ac
Add my_getpagesize.c as source for mysys
2006-11-27 16:04:52 +01:00
msvensson@neptunus.(none)
545fac620f
Add mysys/my_getpagesize as source file foir mysql_upgrade
...
Don't link mysql_upgrade with mysys
2006-11-27 15:00:08 +01:00
msvensson@neptunus.(none)
a45b64b134
Move misplaced #endif
2006-11-27 14:02:14 +01:00
msvensson@neptunus.(none)
a6ce7b89a9
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-27 10:48:41 +01:00
msvensson@neptunus.(none)
1bd6e4f66a
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-27 10:39:40 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
55aa6e04bd
Fix for bug #21587 : FLUSH TABLES causes server crash when used with HANDLER statements
...
Problems (appear only under some circumstances):
1. we get a reference to a deleted table searching in the
thd->handler_tables_hash in the mysql_ha_read().
2. DBUG_ASSERT(table->file->inited == handler::NONE); assert fails in the
close_thread_table().
Fix: end open index scans and table scans and remove references to the
tables from the handler tables hash. After this preparation it is safe
to close the tables. The close can no longer fail on open index/table
scans and the closed table will not be used again by handler functions.
2006-11-27 13:24:24 +04:00
kaa@polly.local
332afaa7b6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-11-24 23:45:31 +03:00
kaa@polly.local
699898c82c
Merge polly.local:/tmp/maint/bug22077/my50-bug22077
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-11-24 17:01:43 +03:00
kaa@polly.local
9ff59261bd
Merge polly.local:/tmp/maint/bug22077/my50-bug22077
...
into polly.local:/tmp/maint/bug22077/my51-bug22077
2006-11-24 16:23:40 +03:00
knielsen@ymer.(none)
c6986359f9
Merge ymer.(none):/usr/local/mysql/tmp/mysql-5.0-maint
...
into ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca
2006-11-24 12:42:56 +01:00
knielsen@ymer.(none)
f007ff64e0
Merge ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca
...
into ymer.(none):/usr/local/mysql/tmp/mysql-5.1-new-maint
2006-11-24 12:40:23 +01:00
knielsen@ymer.(none)
eb9dfafa65
Merge ymer.(none):/usr/local/mysql/tmp/mysql-4.1-maint
...
into ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca
2006-11-24 12:39:16 +01:00
knielsen@ymer.(none)
d4595f3c57
Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
...
traces in Valgrind (broken libc6-dbg).
Installing libc6-dbg on Debian will still provide proper bactraces, even
without setting LD_LIBRARY_PATH explicitly.
2006-11-24 12:38:39 +01:00
msvensson@neptunus.(none)
d4d675a6e2
mysql_fix_priviileg_tables.sql might be in share/ but not in $path_share
...
since that is where the lang files etc are
2006-11-23 21:12:50 +01:00
msvensson@neptunus.(none)
c4af2f26a7
Add mysys/my_getpagesize.c as source file for mysql_upgrade
2006-11-23 21:07:41 +01:00
msvensson@neptunus.(none)
91c3698aba
Convert one more opt_source_dist
2006-11-23 20:08:48 +01:00
msvensson@neptunus.(none)
c99678df03
Fix netware compile failure
...
Remove other warnings about unused variables
2006-11-23 20:07:53 +01:00
msvensson@neptunus.(none)
0e4d97edf0
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-23 18:38:27 +01:00
msvensson@neptunus.(none)
58a8b34e20
Merge bk-internal:/home/bk/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-11-23 18:28:16 +01:00
msvensson@neptunus.(none)
54649b06a3
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-23 18:23:35 +01:00
msvensson@neptunus.(none)
8c2efdf4bd
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-23 18:19:54 +01:00
msvensson@neptunus.(none)
cdbc79b500
Make source_dist a "local" global variable
...
And it's not an "opt"
2006-11-23 17:30:32 +01:00
msvensson@neptunus.(none)
8f85eaf925
Remove duplicate "$report_features"
2006-11-23 17:26:06 +01:00
msvensson@neptunus.(none)
7053ef84bf
Rework my_getpagesize function
...
- Put 'my_getpagesize' in it's own .c file
- Map the call 'my_getpagesize' directly to 'getpagesize' if it exists
- Add default implementation for 'my_getpagesize' to be used if no platform
specfic function exists
2006-11-23 17:23:29 +01:00
mats@romeo.(none)
333f794adc
BUG#24488 (Valgrind warnings on invalid read in mysql_client_binlog_statement):
...
Disabling debug printouts for valgrind builds that print unallocated memory.
2006-11-23 16:21:53 +01:00
msvensson@neptunus.(none)
c76adf6021
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-23 11:57:18 +01:00
msvensson@neptunus.(none)
176313a679
mysql_upgrade should look for .sql script also in share/ directory
2006-11-23 11:56:05 +01:00
msvensson@neptunus.(none)
d3b4712bad
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-23 11:54:25 +01:00