Commit graph

23710 commits

Author SHA1 Message Date
unknown
4a8024c53d Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
2005-06-09 09:20:00 -07:00
unknown
9227cf4254 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-09 09:19:57 -07:00
unknown
8ab8fca7d5 select.test, select.result:
Added a test case for bug #10084.
sql_yacc.yy:
  Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
  added.


sql/sql_yacc.yy:
  Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
  added.
mysql-test/r/select.result:
  Added a test case for bug #10084.
mysql-test/t/select.test:
  Added a test case for bug #10084.
2005-06-09 09:16:16 -07:00
unknown
fec1c6ac67 Merge
BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_check.c:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/sql_mode.result:
  SCCS merged
mysql-test/t/sql_mode.test:
  SCCS merged
sql/sql_acl.cc:
  SCCS merged
sql/sql_handler.cc:
  SCCS merged
sql/sql_table.cc:
  SCCS merged
2005-06-09 17:15:06 +01:00
unknown
2ea6a08e57 2005-06-09 18:02:07 +02:00
unknown
db15e5c391 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into xiphis.org:/usr/home/antony/work2/p1-bug11028.3
2005-06-09 16:44:03 +01:00
unknown
c995109b69 Bug#11028 Crash on create table like
Report error instead of crashing


mysql-test/r/create.result:
  Test for bug 11028
mysql-test/t/create.test:
  Test for bug 11028
sql/sql_table.cc:
  fix for null db name
2005-06-09 16:06:15 +01:00
unknown
5d9cd6a35e Many files:
More yaSSL changes in Visual Studio 6 project files


VC++Files/client/mysql.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqladmin.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/mysql.dsw:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqldump.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqlimport.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqlshow.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqltest.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/libmysql/libmysql.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/libmysqld/libmysqld.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/mysqlcheck/mysqlcheck.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/tests/mysql_client_test.dsp:
  More yaSSL changes in Visual Studio 6 project files
2005-06-09 16:53:08 +02:00
unknown
d0db70270c A fix and test case for Bug#10729 "mysql_stmt_attr_set
CURSOR_TYPE_READ_ONLY". The bug was that we (me) don't perform proper
cleanups of the prepared statement when done fetching from a cursor.
Another patch.


sql/mysql_priv.h:
  Rename reset_stmt_for_execute to init_stmt_before_use (to correspond to
  cleanup_stmt_and_thd_after_use).
sql/sp_head.cc:
  Rename.
sql/sql_prepare.cc:
  Move common cleanup code to a cleanup function, call it when we close
  a cursor.
sql/sql_select.cc:
  Cleanup.
sql/sql_select.h:
  No need for init_thd, this code has been inlined in Cursor::open.
tests/mysql_client_test.c:
  Add a test case for Bug#10729 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY"
  (problem reusing a prepared statemnt if there was a cursor)
2005-06-09 18:17:45 +04:00
unknown
dcfe258fd2 Bug #8183 MERGE and SYM cause wrong SHOW CREATE TABLE
Without this patch, all file elements in info have symlink resolved
pathnames.  This means append_create_info does not  have any way
of showing the correct database name when a symlinked database is used.


myisam/mi_open.c:
  store name (not symlinked resolved) instead of org_name (symlink resolved)
  in info.
2005-06-09 09:00:51 -05:00
unknown
d974ce936e Fix broken test suite. 2005-06-09 18:00:50 +04:00
unknown
9f326d6a66 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/mysql_priv.h:
  Auto merged
2005-06-09 15:53:35 +02:00
unknown
1438e06e3a sql/mysql_priv.h
comments,
    unused flag OPTION_INTERNAL_SUBTRANSACTIONS removed
    SELECT_ALL flag moved into this free slot.


bdb/dist/configure.ac:
  don't link bdb with -pthread on FreeBSD
extra/yassl/taocrypt/include/modes.hpp:
  fix alignment in yassl - proper fix is required
sql/ha_berkeley.cc:
  remove unused flag OPTION_INTERNAL_SUBTRANSACTIONS
sql/mysql_priv.h:
  comments,
  unused flag OPTION_INTERNAL_SUBTRANSACTIONS removed
  SELECT_ALL flag moved into this free slot.
2005-06-09 15:48:57 +02:00
unknown
3889c1e05b mysql_test_run_new.c:
Corrected path to SSL certificate files


mysql-test/mysql_test_run_new.c:
  Corrected path to SSL certificate files
2005-06-09 15:46:33 +02:00
unknown
62b1f1e34f mysql-test-run.pl, mysql-test-run.sh:
Corrected path to SSL certificate files


mysql-test/mysql-test-run.sh:
  Corrected path to SSL certificate files
mysql-test/mysql-test-run.pl:
  Corrected path to SSL certificate files
2005-06-09 15:19:10 +02:00
unknown
baae624cdb Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-09 17:15:50 +05:00
unknown
146893a7a0 Fix for bug #10083 (round doesn't increase scale)
mysql-test/r/func_math.result:
  test result fixed
mysql-test/t/func_math.test:
  test case added
sql/item_func.cc:
  now we always use decimals_to_set
2005-06-09 15:27:26 +05:00
unknown
42b4b3ce58 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Merge/4.1
2005-06-09 15:26:46 +05:00
unknown
0e54a4e84f update result file for ps7_ndb
mysql-test/r/ps_7ndb.result:
  fix result file
2005-06-09 12:26:45 +02:00
unknown
f160958770 Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message
generate proper error message if we use SET ... = NULL for 'set'
  variables
2005-06-09 14:39:29 +05:00
unknown
9f4e920f4a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-06-09 11:37:10 +02:00
unknown
210f576c87 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-09 13:45:43 +05:00
unknown
7073dda620 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.8482
2005-06-09 13:31:29 +05:00
unknown
897b3c50e8 a fix (bug #11193: error messages gets garbled after reggies latest changeset: ChangeSet@1.2260.1.). 2005-06-09 13:13:02 +05:00
unknown
98c2ec7538 Fix for bug #8482 (Incorrect rounding)
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
strings/decimal.c:
  in round(999.9, 0) case we have to increase intg
2005-06-09 12:44:44 +05:00
unknown
467b6dc477 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-06-09 08:12:14 +02:00
unknown
af0287be3c ndb - autotest
small script fixes
  - Don't use hostname -s as it's linux specific
  - Don't remove result unless scp worked


ndb/test/run-test/ndb-autotest.sh:
  Don't use hostname -s as it's linux specific
  Don't remove result unless scp worked
2005-06-09 08:07:48 +02:00
unknown
fa02ee1a52 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-06-09 07:57:10 +02:00
unknown
2e8a10334b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-06-09 07:52:02 +02:00
unknown
b854d06bf0 ndb - uint overflow when running on 64-bit platform with more than 4Gb of mem
bug#10711
bug#10058
bug#9363
bug#9025
bug#8918


ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Use UintPtr when computing page address to make sure that Uint32 does not overflow
2005-06-09 07:49:48 +02:00
unknown
e809d1e189 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0


sql/log_event.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2005-06-08 22:29:10 -07:00
unknown
f63f15e7ab config-win.h:
Enabled yaSSL on Windows
Many files:
  Added yaSSL to Visual Studio 6 project files


VC++Files/mysql.dsw:
  Added yaSSL to Visual Studio 6 project files
VC++Files/client/mysqlclient.dsp:
  Added yaSSL to Visual Studio 6 project files
VC++Files/client/mysqltest.dsp:
  Added yaSSL to Visual Studio 6 project files
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Added yaSSL to Visual Studio 6 project files
VC++Files/sql/mysqld.dsp:
  Added yaSSL to Visual Studio 6 project files
VC++Files/vio/vio.dsp:
  Added yaSSL to Visual Studio 6 project files
include/config-win.h:
  Enabled yaSSL on Windows
2005-06-09 05:04:59 +02:00
unknown
344f13d6f1 Make sure we don't mistake a "grep mysqld" for a mysqld process
when checking if the server is running in mysqld_safe. (Bug #11122)


configure.in:
  Add "grep -v grep" to FIND_PROC so we don't mistake "grep mysqld"
  for a mysqld process.
2005-06-08 18:57:39 -07:00
unknown
92354ea6d6 mysql_client_test.dsp, mysql_test_run_new.dsp, mysqltest.dsp:
Added /FD flag, to avoid include file warnings
mysqlclient.dsp:
  Removed duplicate entry for "strings/ctype-cp932.c"
  Added missing "mysys/my_access.c"
libmysqld.dsp:
  Added missing "mysys/charset.c"
libmysqld.def:
  Added symbol 'get_charset_name'


libmysqld/libmysqld.def:
  Added symbol 'get_charset_name'
VC++Files/libmysqld/libmysqld.dsp:
  Added missing "mysys/charset.c"
VC++Files/client/mysqlclient.dsp:
  Removed duplicate entry for "strings/ctype-cp932.c"
  Added missing "mysys/my_access.c"
VC++Files/client/mysqltest.dsp:
  Added /FD flag, to avoid include file warnings
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Added /FD flag, to avoid include file warnings
VC++Files/tests/mysql_client_test.dsp:
  Added /FD flag, to avoid include file warnings
2005-06-09 00:49:37 +02:00
unknown
2e43fc337b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bgmd


sql/sql_yacc.yy:
  Auto merged
2005-06-09 01:54:18 +04:00
unknown
3fbdaf36be Disable dynamic SQL in stored routines.
This is to close Bug#10975, Bug#7115, Bug#10605 
This feature will be implemented in a future release.


mysql-test/r/sp-error.result:
  Test results fixed (test coverage for disabled Dynamic SQL in SP).
mysql-test/t/sp-error.test:
  Test coverage to disable Dynamic SQL in stored routines.
sql/sql_yacc.yy:
  Disable dynamic SQL in stored routines.
2005-06-09 01:46:30 +04:00
unknown
c23ef5e1f3 Fix problem with handling of lower_case_table_name == 2 when
the case in the FROM and WHERE clauses didn't agree. (Bug #9500)


mysql-test/r/lowercase_table2.result:
  Update results
mysql-test/t/lowercase_table2.test:
  Fix 'DROP TABLE' to not drop tables with the same name.
sql/mysqld.cc:
  Move initialization of table_alias_charset to after we
  have decided what lower_case_table_names should be.
2005-06-08 14:35:16 -07:00
unknown
c6c49859b7 Manual merge
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-06-09 01:13:20 +04:00
unknown
4e0bbc1b6e Fix for bug #11158 "Can't perform multi-delete in stored procedure".
In order to make multi-delete SP friendly we need to have all table 
locks for the elements of main statement table list properly set 
at the end of parsing.

Also performed small cleanup: We don't need relink_tables_for_multidelete()
any longer since the only case now when TABLE_LIST::correspondent_table
is non-zero are tables in auxilary table list of multi-delete and these
tables are handled specially in mysql_multi_delete_prepare().


mysql-test/r/sp-threads.result:
  Added test case for bug #11158 "Can't perform multi-delete in stored
  procedure".
mysql-test/t/sp-threads.test:
  Added test case for bug #11158 "Can't perform multi-delete in stored
  procedure".
sql/mysql_priv.h:
  - Removed third argument from the declaration of multi_delete_precheck()
    as nowdays we calculate number of tables in multi-delete from which
    we are going to delete rows right at the end of statement parsing.
  - Introduced definition of multi_delete_set_locks_and_link_aux_tables()
    which is responsible for propagation of proper table locks from
    multi-delete's auxilary table list to the main list and binding
    corresponding tables in these two lists.
sql/sql_base.cc:
  Removed relink_tables_for_multidelete() routine and its invocations.
  We don't need them in 5.0 since the only case now when
  TABLE_LIST::correspondent_table is non-zero are tables in auxilary table
  list of multi-delete and these tables are handled specially in
  mysql_multi_delete_prepare().
sql/sql_lex.h:
  LEX::table_count
    Added description of new role of this LEX member for multi-delete. 
    Now for this statement we store number of tables from which we should
    delete records there.
sql/sql_parse.cc:
  multi_delete_precheck():
    Moved code which is responsible for iterating through auxilary table
    list and binding its elements with corresponding elements of main
    table list, and properly updating locks in it to separate function -
    multi_delete_set_locks_and_link_aux_tables(). This is because in order
    to make multi-delete SP friendly we need to have all locks set properly
    at the end of statement parsing. So we are introducing new function
    which will be called from parser.
    We also calculate number of tables from which we are going to perform
    deletions there and store this number for later usage in
    LEX::table_count.
    Also removed some no longer needed code.
sql/sql_prepare.cc:
  mysql_test_multidelete():
    Now multi_delete_precheck() takes only two arguments, so we don't
    need to pass fake third parameter.
sql/sql_yacc.yy:
  delete:
    In order to make multi-delete SP friendly we need to have all table 
    locks for the elements of main statement table list properly set 
    at the end of parsing.
2005-06-09 01:07:52 +04:00
unknown
fca6c2fe49 WL#2286 - Compile MySQL w/YASSL support
Fix for yaSSL compilation failure on ia64 platform.


extra/yassl/taocrypt/include/types.hpp:
  Do not use assembler when yaSSL compiled with icc on ia64 platform.
2005-06-08 23:58:34 +05:00
unknown
0537106bef Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.9764
2005-06-08 21:59:03 +05:00
unknown
1c5c678c13 Fix for bug #10896 (0.00 > -0.00)
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
sql/my_decimal.h:
  we neede to check for zero here not to get -0.00
2005-06-08 21:56:22 +05:00
unknown
226ecf1d6f Merge mysql.com:/var/tmp/sslbug/mysql-4.0
into mysql.com:/var/tmp/sslbug/mysql-4.1


include/my_global.h:
  Auto merged
2005-06-08 21:40:58 +05:00
unknown
59445ce472 Fix for
BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4
BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem
Remove obsolete code.


include/my_global.h:
  Obsolete code removed. OpenSSL doesn't have crypt anymore (it was dropped in ~2003).
  This patch fixes compilation failures with both OpenSSL and yaSSL on systems where
  crypt was defined in unistd.h.
  Conclusion is we do not use OpenSSL's crypt unless it wasn't defined in
  unistd.h/crypt.h and it was defined in old OpenSSL.
2005-06-08 21:07:25 +05:00
unknown
8aba6f29cb Trim trailing spaces. 2005-06-08 19:57:26 +04:00
unknown
efb81fdc52 ps_7ndb.result, ps_6bdb.result:
Updated result files


mysql-test/r/ps_6bdb.result:
  Updated result files
mysql-test/r/ps_7ndb.result:
  Updated result files
2005-06-08 17:45:18 +02:00
unknown
60a5939f56 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.9764
2005-06-08 20:38:57 +05:00
unknown
2fded7d5c4 Fix for bug #9764 (DISTINCT IFNULL truncates data)
mysql-test/r/create.result:
  test result fixed
mysql-test/r/distinct.result:
  test result fixed
mysql-test/t/distinct.test:
  test case added
sql/item_cmpfunc.cc:
  max_length should be calculated differently for DECIMAL_RESULT and others
2005-06-08 20:35:37 +05:00
unknown
70c0f31086 Cleanup sql_prepare.cc
sql/sql_prepare.cc:
  Cleanup mysql_test_* family of calls: now we don't send error message
  from mysql_stmt_prepare, so no need to support -1 return code 
  (meaning error is not sent to client) in these functions.
  Move unit->cleanup() to mysql_stmt_prepare() as it's done in most
  of the mysql_test_ functions, and is a no-op for those which don't
  call unit->prepare(). This should make fixing of Bug#10729 (cursors)
  easier.
2005-06-08 19:31:34 +04:00
unknown
dbfce2a555 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/tools/restore/Restore.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
2005-06-08 16:55:06 +02:00