mysql-test/r/func_str.result:
Update results
mysql-test/t/func_str.test:
Add regression tests
sql/item_func.cc:
Handle NULL as first argument to FIELD()
Fixed two deadlocks.
Made minor changes.
mysys/mf_keycache.c:
Bug#10602 - LOAD INDEX INTO CACHE deadlocks
Fixed two deadlocks.
Made keycache traces line buffered.
Removed unused macro and function.
Added comments and trace messages.
Fixed two compiler warnings.
Fixed some coding style issues.
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
spec file)
BitKeeper/deleted/.del-mysql-max.spec.sh~ca055d86585c1010:
Delete: support-files/mysql-max.spec.sh
configure.in:
- removed references to some obsolete files
scripts/make_binary_distribution.sh:
- removed references to some obsolete files
Hand merged from 4.0.
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Stop ignoring name parts and check for validity
mysql-test/r/create.result:
Test for bug#10413
mysql-test/t/create.test:
Test for bug#10413
sql/sql_yacc.yy:
Bug#10413
Stop ignoring parts of fully qualified names.
1.) Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
Used the new option in create_table_from_items().
It is necessary to prevent the SELECT table from being reopend.
It would get new storage assigned for its fields, while the
SELECT part of the command would still use the old (freed) storage.
2.) Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
against a global read lock. This prevents a deadlock in
CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
and avoids the creation of new tables during a global read lock.
3.) Replaced set_protect_against_global_read_lock() and
unset_protect_against_global_read_lock() by
wait_if_global_read_lock() and start_waiting_global_read_lock()
in the INSERT DELAYED handling.
mysql-test/r/create.result:
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Added test results.
mysql-test/t/create.test:
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Added tests which do not require concurrency.
sql/lock.cc:
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
Changed the parameter list.
Removed two unnecessary functions. Their functionality is included in
wait_if_global_read_lock() and start_waiting_global_read_lock().
sql/mysql_priv.h:
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Changed the declaration of mysql_lock_tables().
Added definitions for the new options.
sql/sql_acl.cc:
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Adjusted mysql_lock_tables() calls to the new argument list.
sql/sql_base.cc:
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Adjusted mysql_lock_tables() calls to the new argument list.
sql/sql_handler.cc:
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Adjusted mysql_lock_tables() calls to the new argument list.
sql/sql_insert.cc:
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Replaced set_protect_against_global_read_lock() and
unset_protect_against_global_read_lock() by
wait_if_global_read_lock() and start_waiting_global_read_lock()
in the INSERT DELAYED handling.
Adjusted mysql_lock_tables() calls to the new argument list.
sql/sql_parse.cc:
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
against a global read lock. This prevents a deadlock in
CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
and avoids the creation of new tables during a global read lock.
sql/sql_table.cc:
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Adjusted mysql_lock_tables() calls to the new argument list.
Used the new option in create_table_from_items().
sql/item_sum.cc:
a fix (bug #7405: group_concat with distinct and rollup => ignores distinct in some rows).
Code changed in order to work with rollup extension.
Added test cases for bug #7894.
sql_select.cc:
Fixed bug #7894: GROUP BY queries with ROLLUP returned
wrong results for expressions containing group by columns.
The fix ensured correct results by replacement of all
occurrences of group by fields in non-aggregate expressions
for corresponding ref objects and preventing creation of
fields in temporary tables for expression containing group
by fields.
sql/sql_select.cc:
Fixed bug #7894: GROUP BY queries with ROLLUP returned
wrong results for expressions containing group by columns.
The fix ensured correct results by replacement of all
occurrences of group by fields in non-aggregate expressions
for corresponding ref objects and preventing creation of
fields in temporary tables for expression containing group
by fields.
mysql-test/t/olap.test:
Added test cases for bug #7894.
mysql-test/r/olap.result:
Added test cases for bug #7894.
mysql-test/r/union.result:
test for Bug #10025
mysql-test/t/union.test:
test for Bug #10025
sql/item.cc:
set HA_OPTION_PACK_RECORD and change type to MYSQL_TYPE_STRING, to allow correct field creation in case of length more then 255 (creation STRING field with length more then 255)
myisammrg/myrg_open.c:
Auto merged
mysys/my_getwd.c:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
configure.in:
- manual merge (corrected version number)
engines when lower_case_table_names == 2, as it did previously
for InnoDB and MEMORY. (Bug #9660)
mysql-test/r/lowercase_table2.result:
Fix results
sql/sql_table.cc:
Add build_table_path() function to construct the path to
a table, and use it to replace nearly all of the places
where this was done with similar code.
Fix mysql_rename_table() to not lowercase the .frm file
name when lower_case_table_names == 2 and the storage
engine does not set the HA_FILE_BASED flag (such as InnoDB).
(bug#10674, bug#10681)
support-files/mysql.spec.sh:
Added a missing "make clean" which had caused the original 4.1.12 RPMs to be broken.
(bug#10674, bug#10681)
Faster detection of wrong table names (like PRN) on windows
include/my_sys.h:
Added check_if_legal_filename()
mysys/my_access.c:
Added check_if_legal_filename()
Set errno if my_access() fails
mysys/my_fopen.c:
USe check_if_legal_filename() instead of my_access() to detect wrong file names on windows
mysys/my_open.c:
USe check_if_legal_filename() instead of my_access() to detect wrong file names on windows
sql/sql_lex.cc:
Portability fix
sql/sql_parse.cc:
Simple cleanup
sql/sql_repl.cc:
Cleanup during code review
mysql_test_run_new project files
VC++Files/mysql-test/mysql_test_run_new.dsp:
- added libpath option so that zlib.lib will be found
VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
- added libpath option so that zlib.lib will be found
ndb/src/common/util/File.cpp:
my_stat returns NULL on failure, not non-zero.
i.e. exactly the opposite of stat(2).
providing confusion for unix programmers, who expect errors to be non-zero.
Clean up File_class::exists(char*) to use the my_stat interface properly.
- fixed linking with zlib
VC++Files/client/mysql.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysql_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqladmin.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqladmin_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlcheck.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlcheck_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlclient.dsp:
- added ctype-cp932.c to the file list
VC++Files/client/mysqlclient_ia64.dsp:
- added ctype-cp932.c to the file list
VC++Files/client/mysqldump.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqldump_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlimport.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlimport_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlshow.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlshow_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqltest.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqltest_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/libmysql/libmysql.dsp:
- added ctype-cp932.c to the file list
VC++Files/libmysql/libmysql_ia64.dsp:
- added ctype-cp932.c to the file list
VC++Files/mysql-test/mysql_test_run_new.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlcheck/mysqlcheck.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlcheck/mysqlcheck_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlmanager/mysqlmanager.dsp:
- added zlib.lib to the LINK32 options
VC++Files/strings/strings_ia64.dsp:
- added ctype-cp932.c to the file list