joerg@trift2.
57853e7dfe
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build
...
into trift2.:/MySQL/M41/push-4.1
2007-06-18 21:16:09 +02:00
df@pippilotta.erinye.com
1067f08ac9
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
2007-06-18 20:18:26 +02:00
df@pippilotta.erinye.com
94a3e239c5
don't use bk cset in commit e-mails
2007-06-18 20:13:33 +02:00
joerg@trift2.
1d09be3804
Merge trift2.:/MySQL/M41/clone-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-06-18 19:16:12 +02:00
joerg@trift2.
b9cc9dbb03
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-06-18 11:25:26 +02:00
istruewing@chilla.local
52200be6d0
Merge chilla.local:/home/mydev/mysql-4.1-amain
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-06-15 16:24:43 +02:00
joerg@trift2.
b5c9cab55c
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-06-14 21:27:33 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
79062df3fb
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-06-14 16:35:46 +05:00
df@pippilotta.erinye.com
35413f161a
fix.
2007-06-13 19:23:13 +02:00
df@pippilotta.erinye.com
9dc622e540
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
2007-06-13 15:13:54 +02:00
joerg@trift2.
a4a2c7202c
Merge trift2.:/MySQL/M41/tmp-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-06-13 13:35:04 +02:00
joerg@trift2.
018a5d403b
sql/item_func.cc
...
Improved check for thread identity in the "embedded" case,
provided by Monty.
This finishes the fixes for bug#27078.
2007-06-13 13:33:00 +02:00
df@pippilotta.erinye.com
51672e9598
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-06-13 12:58:56 +02:00
df@pippilotta.erinye.com
36ea2e3091
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-06-13 11:48:07 +02:00
df@pippilotta.erinye.com
320ec82616
BK changes for
...
https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally
2007-06-13 11:44:58 +02:00
joerg@trift2.
bd0b478e30
VC++Files/sql/mysqld.vcproj
...
Ensure ".pdb" and ".map" files are created for the MySQL server, in all configurations.
2007-06-12 10:25:24 +02:00
kent@mysql.com/c-554072d5.010-2112-6f72651.cust.bredbandsbolaget.se
425bbb3264
libmysqld.def:
...
Corrected name of mysql_thread_{init,end} (bug#29007)
2007-06-12 01:33:23 +02:00
istruewing@chilla.local
491e9d2292
Merge chilla.local:/home/mydev/mysql-4.1-amain
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-06-11 16:24:29 +02:00
kent@mysql.com/c-554072d5.010-2112-6f72651.cust.bredbandsbolaget.se
665c32a4ac
mysqldemb.vcproj:
...
Added lots of missing files to make "mysqlserver.lib" complete (bug#29007)
mysql.sln:
Let 'mysqlserver' project also depend on 'vio', else "vio.lib" will
not be linked into the "mysqlserver.lib" static embedded lib (bug#29007)
2007-06-10 19:07:18 +02:00
cmiller@zippy.cornsilk.net
a46744a49b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/41gca
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-release
2007-06-08 16:28:48 -04:00
cmiller@zippy.cornsilk.net
4584ac2c73
Bug #28984 : crasher on connect with out of range password length in \
...
protocol
One could send a malformed packet that caused the server to SEGV. In
recent versions of the password protocol, the client tells the server
what length the ciphertext is (almost always 20). If that length was
large enough to overflow a signed char, then the number would jump to
very large after being casted to unsigned int.
Instead, cast the *passwd char to uchar.
2007-06-08 16:10:53 -04:00
joerg@trift2.
2d718ff1c2
Add a cast, needed by some platforms.
...
Still part of the fix for bug#27078.
2007-06-08 17:02:48 +02:00
joerg@trift2.
ab64b2f8f3
Do not use the "thd" pointer to identify a thread in the embedded lib,
...
but rather use the "thread_id" counter.
Fixes bug#27078:
Compile error: lib_sql.cc cast from 'THD*' to 'pthread_t' loses precision
2007-06-07 23:05:18 +02:00
joerg@trift2.
160b784a49
Merge trift2.:/MySQL/M41/bug23504-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-06-07 17:00:13 +02:00
joerg@trift2.
0d84c3f710
netware/*.def : Allocate 128K stack for all executables (bug#23504)
2007-06-07 12:59:31 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
e112a475bd
Merge xiphis.org:/home/antony/work2/mysql-4.1-engines
...
into xiphis.org:/home/antony/work2/mysql-4.1-engines.merge
2007-06-06 11:51:35 -07:00
joerg@trift2.
111212aa40
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-06-06 20:10:52 +02:00
tsmith@quadxeon.mysql.com
75ed2c7d16
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
2007-06-06 19:00:15 +02:00
joerg@trift2.
fef905d0bf
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-06-06 16:05:23 +02:00
gluh@mysql.com/eagle.(none)
466da4ccf1
Bug#28553 mysqld crash in "purge master log before(select time from information_schema)"
...
forbid the use of subselect in PURGE LOGS BEFORE command
2007-06-06 18:29:15 +05:00
joerg/mysqldev@mysql.com/production.mysql.com
0067a9cc02
Raise version number after cloning 4.1.23
2007-06-06 15:22:06 +02:00
iggy@amd64.(none)
9317cd4c2d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into amd64.(none):/src/bug24400/my41-bug24400
2007-06-04 13:02:41 -04:00
msvensson@pilot.(none)
9fd2b5ffaf
Move code after variable delcaration
2007-06-01 19:57:26 +02:00
msvensson@pilot.(none)
92675afc77
Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_value
...
into pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
2007-06-01 14:35:30 +02:00
msvensson@pilot.(none)
09c5c03cb2
Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test failures
...
- Add funtion "query_get_value to allow reading a fields value
into a $variable
2007-06-01 12:01:42 +02:00
svoj@mysql.com/june.mysql.com
0478ef18ec
BUG#28574 - repair table causes queries to fail with various
...
corruption errors: 126,134,145
When one thread attempts to lock two (or more) tables and another
thread executes statement that aborts these locks (e.g. REPAIR
TABLE) we may get a table object with wrong lock type in a table
cache.
For example if SELECT FROM t1,t2 was aborted, subsequent INSERT
INTO t1 may be executed under read lock.
As a result we may get various table corruptions and even a server
crash.
This is fixed by resetting lock type in case lock was aborted by
another thread.
I failed to create reasonable test case for this bug.
2007-06-01 13:50:13 +05:00
tsmith@quadxeon.mysql.com
d12181e9d0
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
2007-05-30 23:45:34 +02:00
kent@mysql.com/kent-amd64.(none)
b217a9e898
Makefile.am, configure.in:
...
Added --with-mysqld-libs configure flag
2007-05-30 22:11:53 +02:00
msvensson@shellback.(none)
b34660a877
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2007-05-23 12:15:25 +02:00
msvensson@shellback.(none)
933afe6cb4
Bug#27396 Wrong check for root priveledge
...
- Check that filemode was set to 0000
2007-05-23 12:13:49 +02:00
svoj@mysql.com/june.mysql.com
a4ddc22621
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2007-05-23 12:38:34 +05:00
tomas@whalegate.ndb.mysql.com
7b2c430f58
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2007-05-22 23:19:45 +02:00
tsmith@quadxeon.mysql.com
2c3bebc570
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
2007-05-21 20:49:24 +02:00
tomas@whalegate.ndb.mysql.com
9f1cba8ec0
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2007-05-21 08:49:15 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
38c8951d11
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-05-18 20:01:49 +05:00
msvensson@pilot.blaudden
7bc79da2c8
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-05-18 12:58:11 +02:00
msvensson@pilot.blaudden
e05aa94353
WL#2247 mysqltest: add option for sorting results
...
- Final touchups
2007-05-18 12:50:23 +02:00
jonas@perch.ndb.mysql.com
990c584e71
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2007-05-18 11:43:43 +02:00
jonas@perch.ndb.mysql.com
3019b64801
ndb - bug#28443
...
review comment 2, atleast 1 signal need for test prg
2007-05-18 11:34:57 +02:00
jonas@perch.ndb.mysql.com
91f3074e31
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2007-05-18 11:06:35 +02:00