Commit graph

44423 commits

Author SHA1 Message Date
kent@mysql.com/kent-amd64.(none)
0e84886d61 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-20 19:23:20 +01:00
joerg@trift2.
86483de2e5 Test "help":
Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.
2007-03-20 19:19:17 +01:00
mtaylor@qualinost.(none)
1f1bb54c19 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-03-20 11:18:40 -07:00
tsmith@quadxeon.mysql.com
76daceab7f Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/b27231/50
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/mysql-5.0-release
2007-03-20 19:11:23 +01:00
tsmith@quadxeon.mysql.com
cbb90f443a Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/b27231/41
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/b27231/50
2007-03-20 19:10:24 +01:00
tsmith@quadxeon.mysql.com
21ed11cda2 Bug #27231: Server crash when dumping into outfile with long FIELDS ENCLOSED BY option
- Problem: data separators were copied to a fixed-size buffer
  on the stack; memcpy was used, without bounds checking; a
  server crash could result if long FIELDS ENCLOSED BY, etc.,
  was given
- Fix: write the separators directly, instead of copying to
  a buffer first (in select_export::send_data())
2007-03-20 19:09:28 +01:00
kent@kent-amd64.(none)
240bbc6d29 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-20 19:04:02 +01:00
mtaylor@qualinost.(none)
02fc829ff6 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-init
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-03-20 10:58:25 -07:00
gkodinov/kgeorge@magare.gmz
354c364ad4 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B24484-5.0
2007-03-20 19:49:38 +02:00
gkodinov/kgeorge@macbook.local
28962a76a3 Bug #24484:
To correctly decide which predicates can be evaluated with a given table
the optimizer must know the exact set of tables that a predicate depends 
on. If that mask is too wide (refer to non-existing tables) the optimizer
can erroneously skip a predicate.
One such case of wrong table usage mask were the aggregate functions.
The have a all-1 mask (meaning depend on all tables, including non-existent
ones).
Fixed by making a real used_tables mask for the aggregates. The mask is
constructed in the following way :
1. OR the table dependency masks of all the arguments of the aggregate.
2. If all the arguments of the function are from the local name resolution 
  context and it is evaluated in the same name resolution
  context where it is referenced all the tables from that name resolution 
  context are OR-ed to the dependency mask. This is to denote that an
  aggregate function depends on the number of rows it processes.
3. Handle correctly the case of an aggregate function optimization (such that
  the aggregate function can be pre-calculated and made a constant).

Made sure that an aggregate function is never a constant (unless subject of a 
specific optimization and pre-calculation).  

One other flaw was revealed and fixed in the process : references were 
not calling the recalculation method for used_tables of their targets.
2007-03-20 19:46:02 +02:00
msvensson@pilot.blaudden
273eb9bd72 my_print_default does not need to be linked with odbc32.lib(and friends) 2007-03-20 18:37:09 +01:00
kent@mysql.com/kent-amd64.(none)
39e9a2d316 echo.c:
Corrected GPL to be version 2 only
2007-03-20 18:31:49 +01:00
joerg@trift2.
b57f37d6f7 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2007-03-20 18:17:18 +01:00
kent@kent-amd64.(none)
a149769b2d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-20 17:58:30 +01:00
kent@kent-amd64.(none)
a947708760 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-20 17:53:25 +01:00
tomas@whalegate.ndb.mysql.com
3f16977b32 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-20 17:08:23 +01:00
tomas@whalegate.ndb.mysql.com
7bd5241cb4 enabled test case
+ some fixes to do the enable
2007-03-20 17:07:53 +01:00
jonas@perch.ndb.mysql.com
8c3751209c Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-20 16:36:31 +01:00
jonas@perch.ndb.mysql.com
42b3e0a5af Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-03-20 16:32:11 +01:00
jonas@perch.ndb.mysql.com
9ce7ad943b Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-03-20 16:26:51 +01:00
jonas@perch.ndb.mysql.com
844845c772 ndb - bug#27283 (wl2325-5.0)
Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
2007-03-20 16:16:25 +01:00
jonas@perch.ndb.mysql.com
7898079378 ndb - bug#27291
Fix correct min-value for LockPagesInMemory
2007-03-20 16:08:39 +01:00
iggy@recycle.(none)
a56b04476a Merge recycle.(none):/src/bug23736/my50-bug23736
into  recycle.(none):/src/bug23736/my51-bug23736
2007-03-20 10:54:56 -04:00
msvensson@pilot.blaudden
dc7a024526 chmod u+x win/build-vs*.bat 2007-03-20 15:42:34 +01:00
iggy@recycle.(none)
cd686bf7e8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into  recycle.(none):/src/bug25765/my51-bug25765
2007-03-20 10:35:10 -04:00
iggy@recycle.(none)
988ce58052 Bug#23736 Pointer free error in mysqlbinlog
- Mis-matched SAFEMALLOC defines caused misleading error message.
2007-03-20 10:34:25 -04:00
kaa@polly.local
41992a2729 Merge polly.local:/tmp/maint/bug23775/my50-bug23775
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-03-20 17:27:49 +03:00
iggy@recycle.(none)
ebbd5525ca Post Merge Fix. 2007-03-20 10:22:15 -04:00
kaa@polly.local
41bdc9c1af Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  polly.local:/tmp/maint/mysql-5.1-maint
2007-03-20 17:18:43 +03:00
df@pippilotta.erinye.com
aab816e779 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-03-20 15:15:38 +01:00
kent@mysql.com/kent-amd64.(none)
cd1005ab04 vio.vcproj, mysqld.vcproj, mysys.vcproj, libmysqld.vcproj, mysqldemb.vcproj:
No need to set LICENSE or USE_SYMDIR from project files
make_win_bin_dist:
  Changed location of SQL initialization files to be "share/"
2007-03-20 15:12:50 +01:00
iggy@recycle.(none)
8ecbf6c03d Merge recycle.(none):/src/bug25765/my50-bug25765
into  recycle.(none):/src/bug25765/my51-bug25765
2007-03-20 10:09:53 -04:00
iggy@recycle.(none)
9a5f0bff4f Bug#25765 too many dbg heap assertions on windows
- SAFEMALLOC should be defined for each project in debug Windows builds.
SAFEMALLOC was not defined for the innodb project. Debug asserts caused 
due to mixed SAFEMALLOC defines.
2007-03-20 10:07:23 -04:00
holyfoot/hf@mysql.com/hfmain.(none)
0233b13572 tests fixed to work in embedded server 2007-03-20 17:53:55 +04:00
kaa@polly.local
24052c23e1 Merge polly.local:/tmp/maint/bug23775/my51-bug23775
into  polly.local:/tmp/maint/mysql-5.1-maint
2007-03-20 15:48:25 +03:00
df@pippilotta.erinye.com
50c909128e Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-03-20 13:44:47 +01:00
df@pippilotta.erinye.com
f6c30190b3 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-03-20 13:34:09 +01:00
df@pippilotta.erinye.com
56856d6f31 small build fix 2007-03-20 13:33:17 +01:00
df@pippilotta.erinye.com
8161dcaacb build fix for netware 2007-03-20 13:32:49 +01:00
msvensson@pilot.blaudden
3dbc0f7852 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-20 11:23:17 +01:00
msvensson@pilot.blaudden
80fb08310e Bug#27070 server logs are created unrequested and in wrong directory
- Avoid defaault log file names looking like <hostname>.pid.slow.log
  by using the FN_REPLACE_EXT flag to 'fn_format'
 - Remove the default log files generated by log_state.test before
   test completes
2007-03-20 11:21:27 +01:00
msvensson@pilot.blaudden
d640af1881 Update test reulst after setting logging to be sent both to file and tables 2007-03-20 11:17:07 +01:00
msvensson@pilot.blaudden
68df4cbc5a Bug#27070 server logs are created unrequested and in wrong directory
- Setting up a A->B->A replication causes relay logs being written
  by the master, remove them when test is finished
2007-03-20 11:15:15 +01:00
tomas@whalegate.ndb.mysql.com
64b9bda21f BUG#24363 If the table structure has been changed, the default action about the restore will fail.
- correction of patch, original patch will segfault for print option
2007-03-20 11:11:08 +01:00
tomas@whalegate.ndb.mysql.com
36e3a94bf8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-20 10:47:56 +01:00
tomas@whalegate.ndb.mysql.com
ac8592ce2c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-20 10:37:11 +01:00
tomas@whalegate.ndb.mysql.com
07d1f742f9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-20 10:25:55 +01:00
df@pippilotta.erinye.com
e4a9917b6c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-03-20 10:24:11 +01:00
df@pippilotta.erinye.com
bc7e1eeeba Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-03-20 10:23:11 +01:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
7c22049dfa Bug #26079 max_binlog_size + innodb = not make new binlog and hang server
There was hanging at binlog_commit by a thread executing autocommit query.

The hang appeared to be due to an overly condtion for early return 
from binlog_commit introduced by bug#20265 fix.

Fixed with reverting the logic back to 5.0 version.
2007-03-20 10:50:10 +02:00