Commit graph

29932 commits

Author SHA1 Message Date
unknown
b3a7131896 buffer overflow and information exposure bugs fixed
(reported by Stefano Di Paola)
2006-04-25 13:37:33 -07:00
unknown
7c018c39bb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug15827-r2
2006-04-26 00:30:54 +04:00
unknown
15e00f1f3d BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that consumes
too much memory. Instead, either create the equvalent SEL_TREE manually, or create only two ranges that
strictly include the area to scan
(Note: just to re-iterate: increasing NOT_IN_IGNORE_THRESHOLD will make optimization run slower for big 
IN-lists, but the server will not run out of memory. O(N^2) memory use has been eliminated)


mysql-test/r/func_in.result:
  Testcase for BUG#15872
mysql-test/t/func_in.test:
  Testcase for BUG#15872
sql/item.cc:
  BUG#15872: Added Item_decimal::set_decimal_value()
sql/item.h:
  UG#15872: Added Item_decimal::set_decimal_value()
sql/item_cmpfunc.h:
  BUG#15872: Added in_vector::create_item(), in_vector::value_to_item() and their implementations in concrete
  classes.
sql/opt_range.cc:
  BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that 
  consumes too much memory. Instead, either 
   A) create the equivalent SEL_TREE manually, making use of the fact that item_not_in->array
      has an ordered IN-list, or
   B) create only two ranges: (-inf|NULL) < X < min_value_from_in_list,  max_value_from_in_list < X
  (Choose #B if the IN-list has > 10K elements)
2006-04-25 23:33:31 +04:00
unknown
9f5cec7622 BUG#19340 small leak in ndbd
small cleanup fixes in kernel/vm/Configuration


ndb/src/kernel/vm/Configuration.cpp:
  clean up m_logLevel
  
  free the connectstring if we allocated one
2006-04-25 10:04:46 -07:00
unknown
27ace48127 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2006-04-25 16:01:54 +02:00
unknown
abc0d700bb ndb - bug#18597
Handle early abort of scan, so that resources are correctly freed


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Handle early abort
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle early abort so that require on running.empty() does not fire
2006-04-25 16:01:08 +02:00
unknown
8f38fc670b Merge epotemkin@lsmy3:/data/users/bk/mysql-5.0-opt-bugs
into moonbone.local:/work/18739-bug-5.0-mysql
2006-04-25 17:45:31 +04:00
unknown
d00a6cf46c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-04-25 12:46:40 +02:00
unknown
e42428d592 Fixed memleak detected by valgrind 2006-04-25 12:40:31 +02:00
unknown
cb4bcbc0d1 Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0-mtr-fix
into  mysql.com:/data0/knielsen/mysql-5.0-mtr-fix
2006-04-24 23:56:36 +02:00
unknown
413256c814 Merge mysql.com:/usr/local/mysql/mysql-4.1
into  mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/case.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/case.result:
  SCCS merged
2006-04-24 23:51:47 +02:00
unknown
fefc045274 Revert use of octal numbers for chmod 2006-04-24 21:42:44 +02:00
unknown
1dad067fda having.test:
After merge fix for bug#18739


mysql-test/t/having.test:
  After merge fix for bug#18739
2006-04-24 20:59:23 +04:00
unknown
ccee4036c2 Manually merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-04-24 17:52:15 +04:00
unknown
f9216cdf8d Fix typo in mysql-test-run.pl (not caught by aotupush since it uses mysql-test-run.sh).
mysql-test/mysql-test-run.pl:
  Fix typo.
2006-04-24 15:34:01 +02:00
unknown
ed13632db6 Update disabled message to include bug no.
mysql-test/t/disabled.def:
  Update disabled message
2006-04-24 14:25:34 +02:00
unknown
008da9b950 Test it it works better to set no read access for a file by using 000 instead of -r
Looks like the trigger.test works that way


mysql-test/t/information_schema.test:
  Test it it works better to set no read access for a file by using 000 instead of -r
2006-04-24 13:51:21 +02:00
unknown
d0711c7caa Update help message for start-and-exit 2006-04-24 13:33:33 +02:00
unknown
7006173c72 Ad file "have_ndb_status_ok.require"
mysql-test/r/have_ndb_status_ok.require:
  New BitKeeper file ``mysql-test/r/have_ndb_status_ok.require''
2006-04-24 13:25:50 +02:00
unknown
7000f474b3 Use "eval select" when evaluating the environment variable "$MYSQL_TEST_ROOT" 2006-04-24 12:01:16 +02:00
unknown
48757ce3c2 Make have_ndb.in portable
mysql-test/include/have_ndb.inc:
  Remove the "exec test" and instead use the portable way to
  check an environment variable using "eval select". The value of 
  $NDB_STATUS_OK will this be replace by mysqltest and the query 
  "select "YES" and ndb_status_ok" will be sent to the server and back.
mysql-test/mysql-test-run.pl:
  Move initializetion of NDB_STATUS_OK and only do it once in init part of scripot. This will make it possible to  set 
  it to NO if we detect that cluster can't be started.
2006-04-24 12:00:11 +02:00
unknown
8df792b709 Bug#19084 ./mysql-test-run.pl do not print bootstrap run info
- Log boostratp/install to var/log/boostrap.log
 - Log output from mysqladmin to var/log/mysqladmin.log
 - Remove old manager references


mysql-test/lib/mtr_process.pl:
  Log output from mysqladmin to var/log/mysqladmin.log
mysql-test/mysql-test-run.pl:
  Log output from boostrap/install of db's to var/log/bootstrap.log
  Remove references to old manager
2006-04-24 11:26:41 +02:00
unknown
f3e00e9f09 Cleanup formatting
BitKeeper/etc/ignore:
  Added extra/yassl/taocrypt/benchmark/benchmark extra/yassl/taocrypt/test/test extra/yassl/testsuite/testsuite to the ignore list
2006-04-24 10:39:56 +02:00
unknown
40a28090f4 Remove the old unused code for setting a PATH 2006-04-24 10:33:24 +02:00
unknown
73f5ae213d Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-4.1-mtr-fix
into  mysql.com:/data0/knielsen/mysql-4.1-mtr-fix
2006-04-24 10:28:31 +02:00
unknown
d7a5eecad8 Move copy_dir to mtr_misc and rename it to mtr_copy_dir 2006-04-24 10:27:13 +02:00
unknown
55198b5489 Remove 5 second sleep for win32 2006-04-24 10:22:26 +02:00
unknown
1d16bc69cf Bug#17002 mysql-test-run as root user
- Add test to see if tests are running with root permissions
 - Disables tests that uses chmod if that is the case


mysql-test/mysql-test-run.pl:
  Add test to check if mysql-test-run is run with root permission. 
  Set environment variable MYSQL_TEST_ROOT to 'YES' or 'NO'.
mysql-test/t/information_schema.test:
  Disable test if running as root
mysql-test/t/rpl_rotate_logs.test:
  Disable test if running as root.
mysql-test/include/not_as_root.inc:
  New BitKeeper file ``mysql-test/include/not_as_root.inc''
mysql-test/r/not_as_root.require:
  New BitKeeper file ``mysql-test/r/not_as_root.require''
2006-04-24 10:21:09 +02:00
unknown
2a138695bf Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2006-04-24 09:39:28 +02:00
unknown
9a7a78f700 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b17896
2006-04-24 08:01:10 +02:00
unknown
3e1ff238a7 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2006-04-23 19:52:01 -05:00
unknown
3d7fe27202 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2006-04-23 19:50:03 -05:00
unknown
6f1410d4e7 Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2006-04-23 19:49:05 -05:00
unknown
868c49e36c myisam_ftdump.c:
myisam_ftdump options: --help first, then rest in
  lexical order.


myisam/myisam_ftdump.c:
  myisam_ftdump options: --help first, then rest in
  lexical order.
2006-04-23 19:26:56 -05:00
unknown
61ccffb398 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0


sql/sql_base.cc:
  manual merge use local
2006-04-23 21:30:04 +03:00
unknown
d1e1f4f77c Merge mysql.com:/net/nb/home/elkin/MySQL/FIXES/5.0-bug17263-temp_drop
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0


mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
2006-04-23 20:06:30 +03:00
unknown
65cce20c4b Bug#17263 temporary tables and replication
The fix refines the algorithm of generating DROPs for binlog. 
Temp tables with common pseudo_thread_id are clustered into one query. 
Consequently one replication event per pseudo_thread_id is generated.


mysql-test/r/rpl_temporary.result:
  results
mysql-test/t/rpl_temporary.test:
  Creating temp tables associated with a set of pseudo_thread_id values within a connection.
  The aim is to see that slave digest master's binlog consisting of DROP temprorary tables.
sql/sql_base.cc:
  close_temporary_tables is rewritten to generate sequence of DROP temprorary tables with common preudo_thread_id stored in temp table definition.
2006-04-23 19:59:43 +03:00
unknown
4189bfa421 Bug#17263: incorrect DROP query in temporary tables replication
accounting non-ai32 in tmpkeyval. This changeset is supposed to be specifically for 4.1.
Another changeset is going to push into 5. 


sql/sql_base.cc:
  correction due to uint4korr definition: can not sizeof on not ia32.
2006-04-23 19:42:26 +03:00
unknown
d30bfd323a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2006-04-23 08:44:54 -07:00
unknown
c80bff65a1 manual merge use local 2006-04-23 12:32:41 +03:00
unknown
a9edb4b3fb Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0


mysql-test/r/rpl_temporary.result:
  manual merge use local
2006-04-23 12:32:40 +03:00
unknown
e0ebbf67a3 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0


mysql-test/t/func_compress.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2006-04-23 12:32:39 +03:00
unknown
8e28ab1f40 Merge mysql.com:/opt/local/work/mysql-5.0-root
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge


sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-04-23 13:32:38 +04:00
unknown
dc796fce4d Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0


mysql-test/r/innodb.result:
  SCCS merged
mysql-test/t/innodb.test:
  SCCS merged
2006-04-23 13:32:37 +04:00
unknown
329ebbd14d Bug#17263 temporary tables and replication
Backporting a changeset made for 5.0. Comments from there:

  The fix refines the algorithm of generating DROPs for binlog.
  Temp tables with common pseudo_thread_id are clustered into one query.
  Consequently one replication event per pseudo_thread_id is generated.




mysql-test/r/rpl_temporary.result:
  results changed
mysql-test/t/rpl_temporary.test:
  test to generate problematic drop in binlog to feed it to restarting slave
  to see no stop.
sql/sql_base.cc:
  change in drop temprorary tables alg in close_temporary_tables.
2006-04-23 12:18:57 +03:00
unknown
8ed06b840e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/innodb/mysql-4.1
2006-04-23 13:18:56 +04:00
unknown
e33031e76a Merge 192.168.0.20:mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-22 21:54:38 +02:00
unknown
609e96e1db Fix for building shared libraries on AIX with 64-bit mode
Set building of shared libraries on QNX to defatul OFF


configure.in:
  -Libtool forgets to pass the -q64 and -X64 flags to "nm" and "xlc_r" when building
  for 64-bit on AIX. Add some hacks before we create libtool that fixes this.
  This test should be integrated into autoconf/libtool
  
  -Set default to not build shared librarues on QNX. When building libmysqlclient and libmysqlclient_r
  so many objects are passed to libtool that sh propably runs out of stack  and segfaults.
2006-04-22 21:53:33 +02:00
unknown
2efefe6890 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  mysql.com:/home/dlenev/mysql-5.0-bg15153-2
2006-04-22 11:56:15 +04:00
unknown
dc526db887 Fix for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs".
Error was emitted when one tried to select information from view which used
merge algorithm and which also had CONVERT_TZ() function in its select list.

This bug was caused by wrong assumption that global table list for view
which is handled using merge algorithm begins from tables belonging to
the main select of this view. Nowadays the above assumption is not true only
when one uses convert_tz() function in view's select list, but in future
other cases may be added (for example we may support merging of views
with subqueries in select list one day). Relying on this false assumption
led to the usage of wrong table list for field lookups and therefor errors. 

With this fix we explicitly use pointer to the beginning of main select's
table list.


mysql-test/r/timezone_grant.result:
  Added additional test case for bug#15153 "CONVERT_TZ() is not allowed in
  all places in VIEWs" that checks that usage of CONVERT_TZ() function in view
  does not require additional privileges.
mysql-test/r/view.result:
  Added test case for bug#15153 "CONVERT_TZ() is not allowed in all places in 
  VIEWs".
mysql-test/t/timezone_grant.test:
  Added additional test case for bug#15153 "CONVERT_TZ() is not allowed in
  all places in VIEWs" that checks that usage of CONVERT_TZ() function in view
  does not require additional privileges.
mysql-test/t/view.test:
  Added test case for bug#15153 "CONVERT_TZ() is not allowed in all places in 
  VIEWs".
sql/sql_view.cc:
  mysql_make_view():
    We should not assume that global table list for view which is handled using
    merge algorithm begins from tables belonging to the main select of this
    view. Nowadays the above assumption is not true only when one uses
    convert_tz() function in view's select list, but in future other cases
    may be added (for example we may support merging of views with subqueries
    in select list one day). So let us instead explicitly use pointer to the
    beginning of main select's table list.
2006-04-22 11:54:25 +04:00