Commit graph

29744 commits

Author SHA1 Message Date
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
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
98a2008fd2 Backport fix for mysql client not using SSl library directly
- Add function mysql_get_ssl_cipher
 - Use function mysql_get_ssl_cipher from mysql


client/mysql.cc:
  Backport fix for mysql client not using SSl library directly
include/mysql.h:
  Backport fix for mysql client not using SSl library directly
libmysql/libmysql.def:
  Backport fix for mysql client not using SSl library directly
libmysqld/libmysqld.def:
  Backport fix for mysql client not using SSl library directly
sql-common/client.c:
  Backport fix for mysql client not using SSl library directly
2006-04-22 00:48:13 +02:00
unknown
a66fc918e9 Remove -Wall etc, not so portable compiler options 2006-04-21 19:53:30 +02:00
unknown
8b12304337 Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cpp 2006-04-21 18:19:50 +02:00
unknown
3b76cfc210 Disable udf test 2006-04-21 15:57:03 +02:00
unknown
2600133ed5 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-21 09:52:21 +02:00
unknown
f7b68502a8 Merge neptunus.(none):/home/msvensson/mysql/my50-bug18837
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


configure.in:
  Auto merged
2006-04-21 09:47:21 +02:00
unknown
1f3d54b477 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/mysql-5.0-maint
2006-04-20 16:17:36 +02:00
unknown
67aca614ba Bug#18964 "return 0 instead of DBUG_RETURN(0) in sql_base.cc::open_table()"
fixlet corrects return to DBUG_RETURN to restore the balance.


sql/sql_base.cc:
  DBUG_ENTER without DBUG_RETURN in open_table()
2006-04-20 01:02:33 +02:00
unknown
c5faf3689b debugging a BK issue 2006-04-20 00:55:30 +02:00
unknown
073e16999e Bug#18964 "return 0 instead of DBUG_RETURN(0) in sql_base.cc::open_table()"
fixlet corrects return to DBUG_RETURN to restore the balance.


sql/sql_base.cc:
  DBUG_ENTER without DBUG_RETURN in open_table()
2006-04-19 22:56:48 +02:00
unknown
527d180571 Merge 192.168.0.20:mysql/my50-yassl_3/
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-19 14:15:17 +02:00
unknown
f5b0b1c3a8 Merge neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-19 13:56:09 +02:00
unknown
8bc1fa97dc Add the .der files used by yaSSL benchmark
extra/yassl/taocrypt/benchmark/dh1024.der:
  New BitKeeper file ``extra/yassl/taocrypt/benchmark/dh1024.der''
extra/yassl/taocrypt/benchmark/dsa1024.der:
  New BitKeeper file ``extra/yassl/taocrypt/benchmark/dsa1024.der''
extra/yassl/taocrypt/benchmark/rsa1024.der:
  New BitKeeper file ``extra/yassl/taocrypt/benchmark/rsa1024.der''
2006-04-19 11:42:55 +02:00
unknown
feb2815b32 Add .der files, used by yaSSL benchmark
Add benchamrk to dirs to build


extra/yassl/taocrypt/Makefile.am:
  Add benchmark to dirs to build
2006-04-19 11:33:49 +02:00
unknown
707074a558 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-19 10:43:58 +02:00
unknown
8b37d8f6bf Import from upstream yaSSL
extra/yassl/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
2006-04-19 10:21:00 +02:00
unknown
fb62bcb002 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug15530
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
2006-04-19 17:14:35 +10:00
unknown
f909f9965b Cleanup test cases that leaves "stuff" behind
mysql-test/r/ctype_latin2_ch.result:
  Drot table at end of test
mysql-test/r/grant2.result:
  Drop users
mysql-test/r/openssl_1.result:
  Drop users
mysql-test/r/rpl_openssl.result:
  Drop users
mysql-test/r/sp-security.result:
  Drop users
mysql-test/r/sp_notembedded.result:
  Drop table
mysql-test/r/trigger.result:
  Drop table
mysql-test/t/ctype_latin2_ch.test:
  Drop table
mysql-test/t/grant2.test:
  Drop users
mysql-test/t/openssl_1.test:
  Drop users
mysql-test/t/rpl_openssl.test:
  Drop users
mysql-test/t/sp-security.test:
  Drop users
mysql-test/t/sp_notembedded.test:
  Drop table
mysql-test/t/trigger.test:
  Drop table
2006-04-18 18:10:47 +02:00
unknown
f539e5880b Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2006-04-18 17:07:35 +02:00
unknown
eb196d0604 Import from yaSSL upstream
extra/yassl/include/openssl/rsa.h:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/include/yassl_int.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_types.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/helpers.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/list.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/vector.hpp:
  Import patch yassl.diff
extra/yassl/src/handshake.cpp:
  Import patch yassl.diff
extra/yassl/src/socket_wrapper.cpp:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_imp.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_int.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/benchmark/benchmark.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/integer.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/runtime.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/types.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/algebra.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/random.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/template_instnt.cpp:
  Import patch yassl.diff
2006-04-18 14:41:43 +02:00
unknown
5c1b70beb8 Merge 192.168.0.20:mysql/bug13310/my50-bug13310
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2006-04-18 10:55:57 +02:00
unknown
3bcbf91376 BUG#13310 incorrect user parsing by SP
- Strip surrounding ''s from username when a new user connects. There
   is no user 'a@', it should be a@


mysql-test/r/grant2.result:
  Update test result
mysql-test/t/grant2.test:
  Add tests for bug 13310
sql/sql_parse.cc:
  Strip surrounding ''s from username when a new user connects. There 
  is no user 'a@', it should be a@
2006-04-18 10:46:17 +02:00
unknown
da35bb1bb1 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18881
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge


ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
2006-04-18 17:39:05 +10:00
unknown
bf8f30b532 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-17 16:00:49 -04:00
unknown
fab001da89 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-17 10:14:38 -04:00
unknown
7b14ac64bc BUG#17152: Wrong result with BINARY comparison on aliased column
Testsuite added
2006-04-17 16:46:56 +03:00
unknown
591cfbff30 item_timefunc.cc:
5.0 additional fix for b#18691
  Handle DECIMAL the same with INT and REAL.


sql/item_timefunc.cc:
  5.0 additional fix for b#18691
  Handle DECIMAL the same with INT and REAL.
2006-04-17 15:36:25 +05:00
unknown
9844f0abdb Merge mysql.com:/usr/home/bar/mysql-4.1.b18691
into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/item_timefunc.cc:
  After merge fix
2006-04-17 15:01:55 +05:00
unknown
1e2bde0d44 Only expand the empty string to the letters "NULL" if the column
does not have "NOT NULL" attribute set.  Also, calculate the padding
characters more safely, so that a negative number doesn't cause it to 
print MAXINT-n spaces.


mysql-test/r/mysql.result:
  Add test result.
mysql-test/t/mysql.test:
  Add test.
2006-04-16 17:17:36 -04:00
unknown
be4548d4a3 Merge april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/BUG17917/mysql-5.0


sql/mysqld.cc:
  Auto merged
myisam/mi_packrec.c:
  Manual merge.
2006-04-15 16:08:03 +05:00
unknown
ac0ec77832 Bug#19097: rpl_view failed on some platforms
removing comments from the opt file.


mysql-test/t/rpl_view-slave.opt:
  removing `#' comments
2006-04-14 12:13:26 +03:00
unknown
222e58056a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b18691
2006-04-14 13:30:47 +05:00
unknown
8dc06e0f06 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0


sql/item_func.cc:
  Auto merged
2006-04-14 02:02:28 +03:00
unknown
7069599748 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge


sql/sql_yacc.yy:
  Auto merged
2006-04-14 02:38:41 +04:00
unknown
41c0a5a744 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-14 00:17:50 +03:00
unknown
8dbb580748 The check for recursive view definitions added. (BUG#14308)
mysql-test/r/view.result:
  BUG#14308 test suite.
mysql-test/t/view.test:
  BUG#14308 test suite.
sql/share/errmsg.txt:
  New error message about a recursive view.
sql/sql_view.cc:
  The check of view recursion.
2006-04-13 23:12:26 +03:00
unknown
30bd49831b Merge mysql.com:/opt/local/work/mysql-5.0-root
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge


sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  SCCS merged
2006-04-14 00:07:04 +04:00
unknown
68f7928fbd Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  dl145j.mysql.com:/tmp/andrei/5.0-bug18715_drop_view_slave
2006-04-13 20:55:51 +02:00
unknown
72a803dedf postmerge fix: added tinfo support. 2006-04-13 16:06:52 +03:00
unknown
7126fa297d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-13 16:01:08 +03:00
unknown
1cc27df05d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  Auto merged
mysql-test/r/func_op.result:
  Auto merged
sql/item_func.cc:
  Auto merged
2006-04-13 15:07:50 +03:00
unknown
8077c693a6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/MySQL/5.0-Bug-17248a
2006-04-13 21:37:49 +09:30
unknown
93409ee7be Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/psergey/mysql-5.0-csc9139
2006-04-13 16:07:48 +04:00
unknown
c89555edcc BUG#19021, Crash in ROR-index_merge optimizer:
get_best_covering_ror_intersect() was copying ror_scans starting from the 
end of the array and not from its beginning.


mysql-test/r/index_merge_innodb.result:
  Testcase for BUG#19021
mysql-test/t/index_merge_innodb.test:
  Testcase for BUG#19021
sql/opt_range.cc:
  BUG#19021: In get_best_covering_ror_intersect(), the array of pointers to
  scans to be used is [tree->ror_scans, ror_scan_mark), and not
  [ror_scan_mark, ...)
2006-04-13 16:05:32 +04:00
unknown
ef73b5e4b0 Bug#18837 Many build and test failures when configuring without --disable-shared
Build "NOINST" tools with -static flag to avoid  any ld problems when using them


configure.in:
  Build "NOINST" tools with -static flag to avoid  any ld problems when using them
2006-04-13 13:02:58 +02:00
unknown
a875afd6c9 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
2006-04-13 15:40:12 +05:00
unknown
403e6783f5 Fix a typo in the help message.
sql/mysqld.cc:
  Fix a typo.
2006-04-13 14:06:46 +04:00