kaa@kaamos.(none)
d0eb90501d
Merge kaamos.(none):/data/src/mysql-5.0
...
into kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-03-12 10:59:15 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
ab013df080
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
2008-03-07 11:25:47 +02:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
2ebdd5ea2f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1
2008-03-06 15:13:14 +00:00
gluh@mysql.com/eagle.(none)
931bdedbc2
after merge fix
2008-02-29 15:04:00 +04:00
gluh@eagle.(none)
df5fbf5ae0
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2008-02-29 14:05:38 +04:00
gluh@mysql.com/eagle.(none)
13bb7e0a22
Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(ver 4.1,5.0)
...
added new function test_if_data_home_dir() which checks that
path does not contain mysql data home directory.
Using of mysql data home directory in
DATA DIRECTORY & INDEX DIRECTORY is disallowed.
2008-02-29 13:55:00 +04:00
gluh@mysql.com/eagle.(none)
9d42a09675
Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(3rd version for 5.1)
...
added new function test_if_data_home_dir() which checks that
path does not contain mysql data home directory.
Using of 'mysql data home'/'any db name' in
DATA DIRECTORY & INDEX DIRECTORY is disallowed
2008-02-28 16:46:52 +04:00
jani@hynda.mysql.fi
b806eea262
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
...
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
2008-02-27 16:46:32 +02:00
jani@hynda.mysql.fi
b7bef32d2d
Reverted wrong patch, fix for Windows 32bit build.
2008-02-26 18:44:04 +02:00
anozdrin/alik@quad.
bdc83bf2cb
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
...
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-02-26 19:34:02 +03:00
joerg@trift2.
25ab6afc03
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-02-22 16:14:27 +01:00
anozdrin/alik@quad.
5f5773bfc8
Fix for Bug#33065: Mysql not writing general query logs after
...
sending SIGHUP.
There were two problems:
- after some recent fix, the server started to crash after
receiving SIGHUP. That happened because LEX of new THD-object
was not properly initialized.
- user-specified log options were ignored when logs were reopened.
The fix is to 1) initialize LEX and 2) take user-specified options
into account.
There is no test case in this CS, because our test suite does not
support sending SIGHUP to the server.
2008-02-21 14:49:27 +03:00
vvaintroub@wva.
940806c2ed
Merge vvaintroub@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into wva.:C:/bk/bug31745_2/mysql-5.1-build
2008-02-21 01:53:35 +01:00
jani@hynda.mysql.fi
6f03ad0791
Fixed a test.
2008-02-20 16:59:03 +02:00
vvaintroub@wva.
efa91b5479
Merge wva.:C:/bk/bug31745_2/my51_31754_2/..\my50-bug31745_2
...
into wva.:C:/bk/bug31745_2/my51_31754_2
2008-02-19 14:20:46 +01:00
vvaintroub@wva.
f5932c0d95
Bug#31745 - crash handler does not work on Windows
...
- Replace per-thread signal()'s with SetUnhandledExceptionFilter().
The only remaining signal() is for SIGABRT (default abort()
handler in VS2005 is broken, i.e removes user exception filter)
- remove MessageBox()'es from error handling code
- Windows port for print_stacktrace() and write_core()
- Cleanup, removed some unused functions
2008-02-19 12:37:39 +01:00
kaa@kaamos.(none)
5647dee192
Merge kaamos.(none):/data/src/mysql-5.1
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-17 14:57:01 +03:00
jani@hynda.mysql.fi
c7e04cfe96
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
...
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
2008-02-15 17:58:09 +02:00
mkindahl@dl145h.mysql.com
8906700e13
Fixes to try to handle valgrind warnings identical to those in
...
BUG#24387, which is closed since long.
2008-02-14 09:53:01 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
1569f152da
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
2008-02-12 10:45:08 +01:00
tnurnberg@blasphemy.intern.azundris.com
41461f5dc5
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/tnurnberg/21567/51-21567
2008-02-10 17:08:35 +01:00
tnurnberg@blasphemy.intern.azundris.com
5e23ea7288
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/tnurnberg/21567/50-21567
2008-02-10 16:54:41 +01:00
tnurnberg@blasphemy.intern.azundris.com
f76b9cf63b
Merge blasphemy.intern.azundris.com:/home/tnurnberg/21567/50-21567
...
into blasphemy.intern.azundris.com:/home/tnurnberg/21567/51-21567
2008-02-10 13:54:59 +01:00
kostja@dipika.(none)
e9c887cc3d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 18:55:07 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
4f98f3e683
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
2008-02-08 12:13:33 +01:00
davi@mysql.com/endora.local
24830674e8
Bug#31891 Meaningful stack trace
...
On crashes generate a user-friendly resolved and demangled stack
trace when libc provides the necessary functions (newer libc on i386,
x86_64, powerpc, ia64, alpha and s390). Otherwise print a numeric
stack trace as before, relying on resolve_stack_dump utility.
2008-02-07 19:58:06 -02:00
davi@mysql.com/endora.local
1c6768c487
Bug#32633 Can not create any routine if SQL_MODE=no_engine_substitution
...
The problem is that one can not create a stored routine if sql_mode
contains NO_ENGINE_SUBSTITUTION or PAD_CHAR_TO_FULL_LENGTH. Also when
a event is created, the mode is silently lost if sql_mode contains one
of the aforementioned. This was happening because the table definitions
which stored sql_mode values weren't being updated to accept new values
of sql_mode.
The solution is to update, in a backwards compatible manner, the various
table definitions (columns) that store the sql_mode value to take into
account the new possible values. One incompatible change is that if a event
that is being created can't be stored to the mysql.event table, an error
will be raised.
The tests case also ensure that new SQL modes will be added to the mysql.proc
and mysql.event tables, otherwise the tests will fail.
2008-02-07 08:47:39 -02:00
gshchepa/uchum@host.loc
8adc63ad36
Fixed bug#34223: Failure on assignment to my_innodb_autoextend_increment
...
and my_innodb_commit_concurrency global variables.
Type of the my_innodb_autoextend_increment and the
my_innodb_commit_concurrency variables has been changed to
GET_ULONG.
2008-02-07 04:14:50 +04:00
tnurnberg@blasphemy.intern.azundris.com
9928dac5f3
Bug#21567: mysqld doesn't react to Ctrl-C when run under GDB even with the --gdb option
...
Don't block SIGINT (Control-C) when --gdb is passed to mysqld.
Was broken at least on OS X.
(kudos to Mattias Jonsson)
2008-02-05 12:56:49 +01:00
mkindahl@dl145h.mysql.com
4c95b29614
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-31 17:46:50 +01:00
tsmith@ramayana.hindu.god
3906cc27d7
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-25 10:37:29 -07:00
serg@janus.mylan
7b6e89ee39
after merge fix in mysqld.cc:
...
added missing status variables (assert works! :)
2007-12-21 00:00:28 +01:00
serg@janus.mylan
d9ca7b670e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-12-20 22:11:37 +01:00
dkatz@damien-katzs-computer.local
4b8c6e4913
Bug #29836 enable-pstack option appears even if --with-pstack is disabled
...
Placed all pstack code inside of #ifdef's, so the options aren't displayed when not available.
2007-12-20 15:32:56 -05:00
mkindahl@dl145h.mysql.com
bdea24f483
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2007-12-19 18:51:46 +01:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
f988a7e600
Add new pkgplugindir handling to seperate plugins from libraries,
...
and allow override for binary distributions. Extend mysql_config
to print compiled-in plugin location for third-party plugins to
use. Resolves bug#31736.
2007-12-19 13:24:43 +00:00
serg@janus.mylan
1a5b69ec58
SHOW_VAR arrays are null-terminated :-[]
2007-12-19 14:16:10 +01:00
serg@janus.mylan
3bd3bd1e30
Followup for bug#30252.
...
Ensure that all SQLCOM_ constants have corresponding Com_ variables.
2007-12-19 01:27:15 +01:00
dkatz@damien-katzs-computer.local
6b2815bedc
Merge damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
...
into damien-katzs-computer.local:/Users/dkatz/Com_create_function
2007-12-18 13:52:26 -05:00
kostja@bodhi.(none)
bffc615e6c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-12-15 16:59:43 +03:00
dkatz@damien-katzs-computer.local
4b5f344416
Bug #30252 Com_create_function is not incremented.
...
Added Com_create_spfunction and all other commands previously missing to the global status variables.
2007-12-14 18:27:40 -05:00
cmiller@zippy.cornsilk.net
edbacd3a99
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-12-14 13:42:09 -05:00
cmiller@zippy.cornsilk.net
c940d64a69
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-12-14 10:52:10 -05:00
anozdrin/alik@station.
151444c626
Merge station.:/mnt/raid/alik/MySQL/devel/5.1
...
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt
2007-12-14 16:30:22 +03:00
tomas@whalegate.ndb.mysql.com
0bd2a86e90
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-14 06:55:44 +01:00
tomas@whalegate.ndb.mysql.com
70902cdd86
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-14 06:53:55 +01:00
gluh@eagle.(none)
4f5868114a
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-12-13 15:56:04 +04:00
gluh@eagle.(none)
e039595029
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-12-13 14:52:49 +04:00
dkatz@damien-katzs-computer.local
ed00d6955a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
2007-12-12 13:14:02 -05:00
dkatz@damien-katzs-computer.local
9a2b51d34a
Bug #29993 Default value of log_output should be 'FILE', not 'TABLE'
...
Ensure default logging is "file" logging, for additional ways the option can be turned on. Verified on OS X, but not tested automatically.
2007-12-12 13:05:32 -05:00