Commit graph

10000 commits

Author SHA1 Message Date
unknown
d0ed411f79 Fix small bug in udf_example.cc, it was processing one char too much and thus returning junk
Add more DBUG_PRINT's in udf_handler::val_str
Enable udf.test


mysql-test/t/disabled.def:
  Enable udf.test
sql/item_func.cc:
  Add DBUG_ printouts for easier debugging of installed udf's
sql/udf_example.cc:
  Bug fix, break for loop when "n < n_end"
2006-04-28 11:37:20 +02:00
unknown
dc101c2cd0 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/nfstmp1/jwinstead/mysql-5.0-clean


mysql-test/mysql-test-run.pl:
  Auto merged
2006-04-28 00:33:47 +02:00
unknown
c357525e42 Disable udf.test 2006-04-27 22:30:14 +02:00
unknown
185c89c419 Return empty string if file does not exist
Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example


mysql-test/lib/mtr_misc.pl:
  Return empty string if file does not exist
mysql-test/mysql-test-run.pl:
  Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example variable
2006-04-27 21:26:24 +02:00
unknown
d985ed4ca9 Bug #19393: Federated tests fail on Windows under pushbuild
Supplying --skip-rpl to mysql-test-run.pl would always disable the
  slaves, but those slaves may still be needed for the federated tests.
  Now we only disable the slaves when they are not used by any of the
  tests.


mysql-test/mysql-test-run.pl:
  Decide whether to set up and start slave databases based entirely on
  which tests are used, and don't allow --skip-rpl to ruin the party,
  since other tests than replication rely on the slaves (namely federated).
2006-04-27 10:53:19 -07:00
unknown
8d1230c6ad Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
extra/yassl/include/openssl/rsa.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/include/yassl_types.hpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/taocrypt/include/integer.hpp:
  Auto merged
extra/yassl/taocrypt/include/misc.hpp:
  Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
  Auto merged
extra/yassl/taocrypt/src/template_instnt.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Manual merge
extra/yassl/src/handshake.cpp:
  Manual merge
extra/yassl/src/yassl_int.cpp:
  Manual merge
extra/yassl/taocrypt/include/runtime.hpp:
  Manual merge
extra/yassl/taocrypt/src/integer.cpp:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/r/trigger.result:
  Manual merge
mysql-test/t/trigger.test:
  Manual merge
2006-04-27 17:35:29 +02:00
unknown
1bdc15e100 Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is.
Then check in have_udf if that variable is set. Finally use tahe variable when loading the shared library. 


mysql-test/include/have_udf.inc:
  Add check if udf_example.so(or similar) is available
mysql-test/lib/mtr_misc.pl:
  Add funcion "mtr_file_exist" to search for files
mysql-test/mysql-test-run.pl:
  Add checks to find the udf_example.so library
mysql-test/r/udf.result:
  Update result
mysql-test/t/disabled.def:
  Remove udf.test from disabled tests
mysql-test/t/udf.test:
  Use variable UDF_EXAMPLE_LIB when looking for shared library to load
mysql-test/r/have_udf_example.require:
  New BitKeeper file ``mysql-test/r/have_udf_example.require''
2006-04-27 16:32:40 +02:00
unknown
8b553a3f6b Fix bug in ndbcluster.sh on Solaris (now that line is the same as in 5.1)
mysql-test/ndb/ndbcluster.sh:
  redirect to /dev/null to avoid grep -q
2006-04-26 20:50:27 -07:00
unknown
47ce2876b5 Remove obsolete test
mysql-test/r/user_var.result:
  Update results
mysql-test/t/user_var.test:
  Remove unnecessary test
2006-04-26 17:09:41 -07:00
unknown
c09e213b61 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-26 15:29:32 -07:00
unknown
8d52b8a6b7 Merge mysql.com:/home/jimw/my/mysql-5.0-12792
into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_func.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict
2006-04-26 11:39:48 -07:00
unknown
2d91c31b3d Merge mysql.com:/home/jimw/my/mysql-5.0-18617
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/mysql-test-run.pl:
  Resolve conflict
2006-04-26 11:37:53 -07:00
unknown
2d85fd8083 Merge
sql/item.cc:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged
2006-04-26 22:35:40 +04:00
unknown
19cae2e699 Merge mysql.com:/home/jimw/my/mysql-5.0-16195
into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict
2006-04-26 11:34:45 -07:00
unknown
7ab5d5a75e Merge mysql.com:/home/jimw/my/mysql-5.0-19083
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/ndb/ndbcluster.sh:
  Auto merged
2006-04-26 11:32:53 -07:00
unknown
130c26a02a Bug #17849: sql_big_selects not shown in SHOW VARIABLES output
This patch simply adds sql_big_selects to the list of variables
  output by SHOW VARIABLES.


mysql-test/r/variables.result:
  Update results
mysql-test/t/variables.test:
  Add new regression test (and make end-of-tests marker add output)
sql/set_var.cc:
  Add sql_big_selects to SHOW VARIABLES output
2006-04-26 09:21:53 -07:00
unknown
101e3703d9 fixed error message text 2006-04-26 17:57:41 +03:00
unknown
2f4f68be53 Change sleep_until_file_created to sleep 100 millisecond instead of sleeping 1 seconds between each iteration. 2006-04-26 13:22:18 +02:00
unknown
115100c743 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
2006-04-26 12:45:29 +04:00
unknown
c2e1ba6405 Merge mysql.com:/home/alexi/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
2006-04-26 12:43:38 +04:00
unknown
0fc093fa19 Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
2006-04-26 11:23:43 +04:00
unknown
c2e6c898ac Make innodb_mysql produce a non-empty output.
mysql-test/r/innodb_mysql.result:
  Fix result.
2006-04-26 11:15:09 +04:00
unknown
47a0479811 Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work


mysql-test/t/innodb.test:
  Auto merged
2006-04-26 09:56:06 +04:00
unknown
a4c62dbb8a Files innodb.[test|result] are to be used by Innobase only.
Use files innodb_mysql.[test|result] instead.


mysql-test/t/innodb.test:
  This file is to be used by Innobase only.
mysql-test/r/innodb_mysql.result:
  New BitKeeper file ``mysql-test/r/innodb_mysql.result''
   Use this file instead of innodb.result.
mysql-test/t/innodb_mysql.test:
  New BitKeeper file ``mysql-test/t/innodb_mysql.test''
   Use this file instead of innodb.test.
2006-04-26 09:51:57 +04: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
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
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
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
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
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