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.
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
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
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)
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.
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.
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
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
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
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
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.
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.
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.
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.
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.
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
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.
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
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.
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