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)
--database option to hugo tools
ndb/test/ndbapi/testNdbApi.cpp:
Testcase for bug#10669
ndb/test/tools/hugoLoad.cpp:
Add --database=<name> to hugo tools
ndb/test/tools/hugoPkUpdate.cpp:
Add --database=<name> to hugo tools
ndb/test/tools/hugoScanRead.cpp:
Add --database=<name> to hugo tools
ndb/test/tools/hugoScanUpdate.cpp:
Add --database=<name> to hugo tools
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
ndb/test/run-test/ndb-autotest.sh:
ndb autotest
1) merge jonathan changes
2) add --no-report (if dont't want to produce/scp a report)
3) add --no-config (if don't want to create a configuration, i.e there is already one present)
4) add --no-test (for not actually starting test)
5) add checking of conf file
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
to the same as a full key. (Bug #10566)
mysql-test/r/heap.result:
Update results
mysql-test/t/heap.test:
Add test for bug #10566
sql/ha_heap.h:
Add max_supported_key_part_length() method.
VC++Files/strings/strings.dsp:
- added ctype-cp932.c to the project (new charset)
include/config-win.h:
- added a HAVE_CHARSET_cp932 #define to enable the cp932 charset
on Windows
on Windows): applied required patches on top of the 4.1.12
release (will be published as 4.1.12a for Windows)
myisammrg/myrg_open.c:
- Backport of the patch to fix BUG#10687 (Merge engine fails
under Windows): use fn_format to convert pathnames if the files
in the merge file have a pathname
mysys/my_getwd.c:
- Backport of the patch to fix BUG#10687 (Merge engine fails
on Windows): Added test to see if FN_LIBCHAR != '/' before
doing comparison to avoid redundant comparison
sql/ha_myisammrg.cc:
- Backport of the patch to fix BUG#10687 (Merge engine fails
on Windows): added extra debug output
Only acquire necessary write lock for multi-delete
mysql-test/r/lock.result:
Test for Bug#7241
mysql-test/t/lock.test:
Test for Bug#7241
sql/sql_parse.cc:
Bug#7241
Don't acquire write lock on all tables.
Make sure to set lock_type on real table_list
