summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Finalize storage engine pluginsunknown2005-12-2154-684/+1489
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give BerkeleyDB savepoints Remove "enum db_type" from most of the code storage/example/ha_example.h: Rename: sql/examples/ha_example.h -> storage/example/ha_example.h storage/csv/ha_tina.h: Rename: sql/examples/ha_tina.h -> storage/csv/ha_tina.h config/ac-macros/storage.m4: if hton name is "no", then we don't install it as a builtin configure.in: pluggable changes include/plugin.h: version field mysql-test/r/bdb.result: savepoint results copied from innodb test mysql-test/r/information_schema.result: PLUGINS information schema mysql-test/r/information_schema_db.result: PLUGINS information schema mysql-test/t/bdb.test: savepoint test copied from innodb test sql/Makefile.am: tina and example are not here anymore sql/authors.h: minor tweek sql/ha_archive.cc: remove unwanted handlerton entries sql/ha_berkeley.cc: remove unwanted handlerton entries support for savepoints changes to show logs sql/ha_blackhole.cc: remove unwanted handlerton entries sql/ha_federated.cc: remove unwanted handlerton entries sql/ha_heap.cc: remove unwanted handlerton entries sql/ha_innodb.cc: remove unwanted handlerton entries changes for show status sql/ha_myisam.cc: remove unwanted handlerton entries sql/ha_myisammrg.cc: remove unwanted handlerton entries sql/ha_ndbcluster.cc: remove unwanted handlerton entries changes to stat_print sql/ha_partition.cc: remove unwanted handlerton entries bye bye enum db_type sql/ha_partition.h: bye bye enum db_type sql/handler.cc: remove unwanted handlerton entries bye bye enum db_type sql/handler.h: remove unwanted handlerton entries bye bye enum db_type changes to stat_print_fn sql/item_sum.cc: bye bye enum db_type sql/log.cc: remove unwanted handlerton entries sql/mysql_priv.h: bye bye enum db_type sql/mysqld.cc: bye bye enum db_type reorder plugin initialization sql/set_var.cc: bye bye enum db_type sql/set_var.h: bye bye enum db_type sql/sql_base.cc: bye bye enum db_type sql/sql_cache.cc: bye bye enum db_type sql/sql_class.h: bye bye enum db_type sql/sql_delete.cc: bye bye enum db_type sql/sql_insert.cc: bye bye enum db_type sql/sql_lex.h: show plugin sql/sql_parse.cc: bye bye enum db_type sql/sql_partition.cc: bye bye enum db_type sql/sql_plugin.cc: loadable storage engines sql/sql_plugin.h: loadable storage engines sql/sql_rename.cc: bye bye enum db_type sql/sql_select.cc: bye bye enum db_type sql/sql_show.cc: SHOW PLUGIN PLUGINS information schema changes to show engines sql/sql_table.cc: bye bye enum db_type sql/sql_view.cc: bye bye enum db_type sql/sql_view.h: bye bye enum db_type sql/sql_yacc.yy: bye bye enum db_type sql/table.cc: bye bye enum db_type sql/table.h: bye bye enum db_type sql/unireg.cc: bye bye enum db_type storage/csv/ha_tina.cc: make tina into a loadable plugin storage/example/ha_example.cc: make into a plugin storage/csv/Makefile.am: New BitKeeper file ``storage/csv/Makefile.am'' storage/example/Makefile.am: New BitKeeper file ``storage/example/Makefile.am''
* Merge mysql.com:/home/jimw/my/mysql-5.1-releaseunknown2005-11-3031-834/+1887
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean mysql-test/t/alter_table.test: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/table.cc: Auto merged mysql-test/r/show_check.result: Resolve conflict sql/authors.h: Resolve conflicts, update replication/backup developers
| * More Win32 byte* vs. char* fixes.unknown2005-11-291-2/+2
| |
| * Fix byte * vs. char * mismatches that break Win32 compilation.unknown2005-11-293-12/+12
| |
| * Add Ingo to SHOW AUTHORSunknown2005-11-281-0/+1
| | | | | | | | | | sql/authors.h: Add Ingo
| * Small tweaks to SHOW AUTHORS listunknown2005-11-281-3/+4
| | | | | | | | | | sql/authors.h: Put Krow in parens to be consistent with other nicknames
| * Update list of authors with information from documentation.unknown2005-11-283-42/+133
| | | | | | | | | | | | | | | | | | | | | | mysql-test/r/show_check.result: Remove authors from test result mysql-test/t/show_check.test: Don't put list of authors in results, just test that SHOW AUTHORS doesn't give us any sort of error sql/authors.h: Add copyright notice, fix formatting of comments, update and alphabetize list of authors, fix up formatting of entries.
| * Merge mysql.com:/M50/testbugs-5.0 into mysql.com:/M51/clone-5.1unknown2005-11-281-0/+2
| |\ | | | | | | | | | | | | mysql-test/t/alter_table.test: Auto merged
| * \ Merge mysql.com:/M51/tmp-5.1 into mysql.com:/M51/clone-5.1unknown2005-11-281-1/+1
| |\ \ | | | | | | | | | | | | | | | | sql/mysqld.cc: Auto merged
| * | | Added my name.unknown2005-11-281-0/+1
| | | |
| * | | (no commit message)unknown2005-11-281-0/+1
| | | |
| * | | mysql-test-run.pl:unknown2005-11-263-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added search for 'my_print_defaults' when running from source tree on Windows trigger-grant.test, trigger-compat.test: Removed --text from grep, not portable mysql-test/t/trigger-compat.test: Removed --text from grep, not portable mysql-test/t/trigger-grant.test: Removed --text from grep, not portable mysql-test/mysql-test-run.pl: Added search for 'my_print_defaults' when running from source tree on Windows
| * | | Many files:unknown2005-11-2613-758/+1640
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable build on Windows VC++Files/mysql.sln: Enable build on Windows VC++Files/libmysqld/libmysqld.vcproj: Enable build on Windows VC++Files/myisam_ftdump/myisam_ftdump.vcproj: Enable build on Windows VC++Files/myisamchk/myisamchk.vcproj: Enable build on Windows VC++Files/myisamlog/myisamlog.vcproj: Enable build on Windows VC++Files/myisampack/myisampack.vcproj: Enable build on Windows VC++Files/mysqldemb/mysqldemb.vcproj: Enable build on Windows VC++Files/mysqlserver/mysqlserver.vcproj: Enable build on Windows VC++Files/sql/mysqld.vcproj: Enable build on Windows VC++Files/storage/bdb/bdb.vcproj: Enable build on Windows VC++Files/storage/myisam/myisam.vcproj: Enable build on Windows VC++Files/storage/myisammrg/myisammrg.vcproj: Enable build on Windows VC++Files/strings/strings.vcproj: Enable build on Windows
| * | | Makefile.am:unknown2005-11-268-11/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Distribute "handlerton-win.cc" mysqld.cc: Corrected word lenght for some innobase configuration variables Makefile.am: Added Visual Studio 7 project file to EXTRA_DIST ha_partition.cc, sql_partition.cc: Changed include to use "..." for Windows handlerton-win.cc: Handle engine include/exclude with defines for Windows new file sql/handlerton-win.cc: Handle engine include/exclude with defines for Windows sql/sql_partition.cc: Changed include to use "..." for Windows sql/ha_partition.cc: Changed include to use "..." for Windows extra/yassl/Makefile.am: Added Visual Studio 7 project file to EXTRA_DIST extra/yassl/taocrypt/Makefile.am: Added Visual Studio 7 project file to EXTRA_DIST sql/mysqld.cc: Corrected word lenght for some innobase configuration variables sql/Makefile.am: Distribute "handlerton-win.cc"
* | | | After-merge cleanups to alter_table testunknown2005-11-302-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/alter_table.result: Add drop table that got axed in merge mysql-test/t/alter_table.test: Fix merge
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanunknown2005-11-302-26/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean
| * \ \ \ Merge mysql.com:/home/jimw/my/mysql-5.0-14610unknown2005-11-301-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| | * | | | Don't try to mysqlhotcopy the INFORMATION_SCHEMA database. (Bug #14610)unknown2005-11-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/mysqlhotcopy.sh: Skip INFORMATION_SCHEMA when matching database names against regex.
| * | | | | Fix union.resultunknown2005-11-301-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/union.result: Fix order of test results
* | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanunknown2005-11-3011-19/+589
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean VC++Files/sql/mysqld.dsp: Auto merged sql/item.cc: Auto merged sql/sql_table.cc: Auto merged mysql-test/r/alter_table.result: Resolve conflict mysql-test/t/alter_table.test: Resolve conflict
| * | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-11-302-0/+508
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean vio/viosslfactories.c: Auto merged
| | * \ \ \ \ Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-301-11/+10
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/timka/mysql/src/5.0-virgin
| | | * \ \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/4.1unknown2005-11-301-11/+10
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.0 vio/viosslfactories.c: Auto merged
| | * | | | | | | WL#2486 - natural/using join according to SQL:2003unknown2005-11-302-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commented out one failing query in the regression test (reported as a bug). mysql-test/r/join.result: Commented out failing query. mysql-test/t/join.test: Commented out failing query.
| | * | | | | | | WL#2486 - natural/using join according to SQL:2003.unknown2005-11-302-0/+513
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented specialized regression test for the WL. mysql-test/r/join.result: Test results for natural join tests. mysql-test/t/join.test: Specialized test for natural join, and join ... on.
| * | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-11-294-13/+59
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/r/union.result: Auto merged sql/item.cc: Auto merged vio/viosslfactories.c: Auto merged mysql-test/t/union.test: Resolve conflict
| | * | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-14216unknown2005-11-293-2/+49
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean sql/item.cc: Auto merged
| | | * | | | | Fix bug in handling of decimal fields in UNION statements that couldunknown2005-10-283-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cause a crash or write to an incorrect memory location. (Bug #14216) mysql-test/r/union.result: Update results mysql-test/t/union.test: Add regression test sql/item.cc: Set max_length for decimal fields correctly
| | * | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-291-11/+10
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/4.1
| | | * | | | | | Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8aunknown2005-11-291-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added SSL_library_init()
| * | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-291-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/dev/mysql-5.0-build
| | * | | | | | | | Changed mysqld.dsp to avoid compilation error in VC++unknown2005-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/sql/mysqld.dsp: Corrected wrong path to ha_archive.cpp (causes compilation error in VC++)
| * | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-11-294-96/+66
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/mysql-5.0
| * | | | | | | | | | test fixedunknown2005-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/type_ranges.result: result fixed
| * | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0unknown2005-11-293-1/+19
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0.14693 sql/sql_table.cc: Auto merged
| | * | | | | | | | | | Fix for bug #14693 (ALTER COLUMN SET DEFAULT has no effect)unknown2005-11-243-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/alter_table.result: test result mysql-test/t/alter_table.test: test case sql/sql_table.cc: we should set the flag with the ALTER requirements
* | | | | | | | | | | | check-cpu:unknown2005-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add XEON detection (fix) BUILD/check-cpu: Add XEON detection (fix)
* | | | | | | | | | | | Fix for bug#5323, no bug, new error codeunknown2005-11-292-2/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Disable a few failing NDB tests until they can be investigatedunknown2005-11-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/disabled.def: Disable failing NDB tests
* | | | | | | | | | | | Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M51/merge-5.1unknown2005-11-291-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/alter_table.test: Auto merged
| * \ \ \ \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-281-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M50/mysql-5.0
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/M50/testbugs-5.0 into mysql.com:/M50/mysql-5.0unknown2005-11-281-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | mysql-test/t/alter_table.testunknown2005-11-281-0/+2
| | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Care for case-insignificant platforms (Mac OS X, Windows). mysql-test/t/alter_table.test: Care for case-insignificant platforms (Mac OS X, Windows).
* | | | | | | | | | | | | Merge mysql.com:/usr/local/mysql/mysql-5.0unknown2005-11-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/mysql-5.1-new BitKeeper/deleted/.del-type_newdecimal-big.result: Delete: mysql-test/r/type_newdecimal-big.result BitKeeper/deleted/.del-type_newdecimal-big.test: Delete: mysql-test/t/type_newdecimal-big.test mysql-test/r/type_newdecimal.result: Auto merged mysql-test/t/type_newdecimal.test: Auto merged
| * | | | | | | | | | | | Moved long running query to type_newdecimal-big.testunknown2005-11-294-96/+66
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups [Backported from mysql-5.1-new @1.1961.1.1] mysql-test/r/type_newdecimal.result: Moved long running query to type_newdecimal-big.test Removed warnings that depends on floating point comparisions [Backported from mysql-5.1-new] mysql-test/t/type_newdecimal.test: Moved long running query to type_newdecimal-big.test Removed warnings that depends on floating point comparisions [Backported from mysql-5.1-new]
* | | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-5.0unknown2005-11-2919-35/+129
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged sql/item.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/log_event.cc: Auto merged sql/sql_parse.cc: Auto merged sql/table.cc: Auto merged
| * | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b10446unknown2005-11-295-15/+53
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0 mysql-test/r/ctype_recoding.result: Auto merged sql/item.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged
| | * | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-295-15/+53
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b10446 sql/item.cc: Auto merged
| | | * | | | | | | | | Bug#10446 Illegal mix of collations:unknown2005-11-215-15/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | item_strfunc.h, item_strfunc.cc, item.cc: Try to convert a const item into destination character set. If conversion happens without data loss, then cache the converted value and return it during val_str(). Otherwise, if conversion loses data, return Illeral mix of collations error, as it happened previously. ctype_recoding.result, ctype_recoding.test: Fixing tests accordingly. sql/item.cc: Bug#10446 Illegal mix of collations Try to convert a const item into destination character set. If conversion happens without data loss, then cache the converted value and return it during val_str(). Otherwise, if conversion loses data, return Illeral mix of collations error, as it happened previously. sql/item_strfunc.cc: Return cached value when it's possible. mysql-test/t/ctype_recoding.test: Fixing tests accordingly. mysql-test/r/ctype_recoding.result: Fixing tests accordingly.
| | * | | | | | | | | | Merge mysqldev@production:my/mysql-4.1.16-fixesunknown2005-11-282-5/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/mysql-4.1