summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* mysql_config.sh:unknown2006-03-271-8/+19
| | | | | | | | We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322 scripts/mysql_config.sh: We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
* Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2006-03-2730-330/+1177
|\ | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
| * ndb - autotestunknown2006-03-274-12/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert() Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args) ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args) ndb/test/ndbapi/testNodeRestart.cpp: Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args) ndb/test/src/NdbBackup.cpp: Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args) ndb/test/src/NdbRestarts.cpp: Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
| * ndb -unknown2006-03-231-4/+4
| | | | | | | | | | | | | | | | remove bug#18385 from autotest as it only works on 2 node clusters ndb/test/run-test/daily-basic-tests.txt: remove bug#18385 as it only works on 2 node clusters
| * ndb -unknown2006-03-233-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | minor fixes in test programs ndb/src/kernel/blocks/ERROR_codes.txt: Fix conflicting error codes ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Fix conflicting error codes ndb/test/ndbapi/testNodeRestart.cpp: Fix test program
| * ndb -unknown2006-03-221-0/+77
| | | | | | | | | | | | | | | | Add per partition info (optionally to ndb_desc) ndb/tools/desc.cpp: Add per partition info (optionally to ndb_desc)
| * ndb - autotest unknown2006-03-221-5/+4
| | | | | | | | | | | | | | | | Update makefile for removed files ndb/test/run-test/Makefile.am: Update makefile for removed files
| * ndb - unknown2006-03-221-4/+5
| | | | | | | | | | | | | | | | some more ndb-autotest updates (previously uncommitted...but in use) ndb/test/run-test/ndb-autotest.sh: More autotest updates
| * ndb -unknown2006-03-225-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minor update to ndb-autotest.sh and config files ndb/test/run-test/conf-daily-devel-ndbmaster.txt: Add SendBufferMemory to remove rare overruns ndb/test/run-test/conf-dl145a.txt: Add SendBufferMemory to remove rare overruns ndb/test/run-test/conf-ndbmaster.txt: Add SendBufferMemory to remove rare overruns ndb/test/run-test/conf-shark.txt: Add SendBufferMemory to remove rare overruns ndb/test/run-test/ndb-autotest.sh: Add support for conf per host
| * ndb - bug#18414unknown2006-03-226-14/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding ndb/src/kernel/blocks/ERROR_codes.txt: New error code ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: remove dumping of LCP info during NF ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding ndb/test/ndbapi/testNodeRestart.cpp: Add testcase for bug18414 ndb/test/ndbapi/testTimeout.cpp: Fix error code checking ndb/test/run-test/daily-basic-tests.txt: Add testcase for bug18414
| * ndb - bug#18118unknown2006-03-212-52/+77
| | | | | | | | | | | | | | | | | | | | timeslice DUMP(7015) ndb/include/kernel/signaldata/DumpStateOrd.hpp: doc... ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: timeslice DUMP(7015)
| * ndb - bug#18385unknown2006-03-219-23/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial system restart, can not try to start with higher GCI that own even if knowing about a higher number ndb/include/kernel/signaldata/DumpStateOrd.hpp: Add new dump for setting time between gcp ndb/include/kernel/signaldata/StartPerm.hpp: Move error codes into StartPerm + Add new error code ndb/src/kernel/blocks/ERROR_codes.txt: Add new error insert ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Move error codes into StartPerm + Add new error code ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fix so that we don't try to restart to a too new GCI when doing a partial start Add new error code when this node later tries to join ndb/test/include/NdbRestarter.hpp: Add new method for selecting random node ndb/test/ndbapi/testSystemRestart.cpp: Add new testcase for bug#18385 ndb/test/run-test/daily-basic-tests.txt: Run test in daily-basic ndb/test/src/NdbRestarter.cpp: Add new method for selecting random node
| * Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-wl2610unknown2006-03-2014-222/+651
| |\ | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/41-work
| | * ndb - bug#18352unknown2006-03-201-1/+0
| | | | | | | | | | | | | | | | | | | | | remove debug prinout
| | * ndb - wl2610, bug#18352unknown2006-03-203-153/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove useless and tricky state fiddleing in TC to syncronize NF_CompleteRep as code is already present in DIH aswell Keep broadcast of TAKEOVER_TCCONF for online upgrade ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Add clever dump for showing active operations ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Remove useless and tricky state fiddleing in TC to syncronize NF_CompleteRep as code is already present in DIH aswell Keep broadcast of TAKEOVER_TCCONF for online upgrade ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Remove useless and tricky state fiddleing in TC to syncronize NF_CompleteRep as code is already present in DIH aswell Keep broadcast of TAKEOVER_TCCONF for online upgrade
| | * ndb - bug#18352unknown2006-03-206-7/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use variable waitfor_response_timeout (depending on TransactionDeadLockTimeout) When getting 4012, set NeedAbort and ReleaseOnClose ndb/src/ndbapi/NdbConnection.cpp: Use variable for WAITFOR_RESPONSE_TIMEOUT ndb/src/ndbapi/Ndbif.cpp: Use variable timeout for waitfor, when receiving 4012, set NeedAbort and ReleaseOnClose ndb/src/ndbapi/TransporterFacade.cpp: Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT ndb/src/ndbapi/TransporterFacade.hpp: Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT ndb/test/ndbapi/testTimeout.cpp: Add testcase for 4012 ndb/test/run-test/daily-basic-tests.txt: Add testcase for 4012
| | * ndb - wl2610unknown2006-03-203-49/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activly abort transactions (that's affected) during NF This removes a lot of bugs that can occur otherwise is using high value for TransactionDeadLockTimout ndb/include/kernel/signaldata/TcContinueB.hpp: New continueb for active transaction abort on nf ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Add bitmask of participating nodes to transaction record Add bitmask of node fail steps, so that NF_CompleteRep is not sent until all steps has completed ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Active transaction baortion
| | * ndb - bug#16772unknown2006-03-173-14/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dont't allow node to join cluster until all nodes has completed failure handling ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: When getting CM_ADD for node that I haven't completed failure handling for do _not_ just override. But instead set state...and send CM_ACK_ADD on execCONNECT_REP (much...later) ndb/test/ndbapi/testNodeRestart.cpp: testcase for bug#16772 ndb/test/run-test/daily-basic-tests.txt: Run test in basic suite
| | * ndb - bug#18298unknown2006-03-172-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8 repeated nr with table wo/ logging cause crash Dont create crashed replica for temporary tables ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Dont create crashed replica for temporary tables ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Dont create crashed replica for temporary tables
* | | config-win.h:unknown2006-03-231-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | If CYBOZU defined, set character sets etc include/config-win.h: If CYBOZU defined, set character sets etc
* | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-2321-56/+122
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b15376 include/m_ctype.h: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-ucs2.c: Auto merged
| * | | Bug#15375 Unassigned multibyte codes are brokenunknown2005-12-1221-56/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into parts when converting to Unicode. m_ctype.h: Reorganizing mb_wc return codes to be able to return "an unassigned N-byte-long character". sql_string.cc: Adding code to detect and properly handle unassigned characters (i.e. the those character which are correctly formed according to the character specifications, but don't have Unicode mapping). Many files: Fixing conversion function to return new codes. ctype_ujis.test, ctype_gbk.test, ctype_big5.test: Adding a test case. ctype_ujis.result, ctype_gbk.result, ctype_big5.result: Fixing results accordingly. include/m_ctype.h: Reorganizing mb_wc return codes to be able to return "an unassigned N-byte long character". Bug#15375 Unassigned multibyte codes are broken into parts when converting to Unicode. mysql-test/r/ctype_big5.result: Fixing results accordingly. mysql-test/r/ctype_gbk.result: Fixing results accordingly. mysql-test/r/ctype_ujis.result: Fixing results accordingly. mysql-test/t/ctype_big5.test: Adding a test case. mysql-test/t/ctype_gbk.test: Adding a test case. mysql-test/t/ctype_ujis.test: Adding a test case. sql/sql_string.cc: Adding code to detect and properly hanlde unassigned characters (i.e. the those character which are correctly formed according to the character specifications, but don't have Unicode mapping). strings/ctype-big5.c: Fixing conversion function to return new codes. strings/ctype-bin.c: Fixing conversion function to return new codes. strings/ctype-cp932.c: Fixing conversion function to return new codes. strings/ctype-euc_kr.c: Fixing conversion function to return new codes. strings/ctype-gb2312.c: Fixing conversion function to return new codes. strings/ctype-gbk.c: Fixing conversion function to return new codes. strings/ctype-latin1.c: Fixing conversion function to return new codes. strings/ctype-simple.c: Fixing conversion function to return new codes. strings/ctype-sjis.c: Fixing conversion function to return new codes. strings/ctype-tis620.c: Fixing conversion function to return new codes. strings/ctype-ucs2.c: Fixing conversion function to return new codes. strings/ctype-ujis.c: Fixing conversion function to return new codes. strings/ctype-utf8.c: Fixing conversion function to return new codes.
* | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-237-5/+76
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b17374
| * | | | Bug#17374: select ... like 'A%' operator fails to find value on columuns ↵unknown2006-03-207-5/+76
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with key Fixed that LIKE worked case insensitively for latin2_czech_cs, which was wrong for a case sensitive collation. include/m_ctype.h: Making my_wildcmp_bin public instead of static strings/ctype-bin.c: Making my_wildcmp_bin public instead of static strings/ctype-czech.c: Use my_wildcmp_bin instead of case insensitive my_wildcmp_8bit mysql-test/include/have_latin2_ch.inc: New BitKeeper file ``mysql-test/include/have_latin2_ch.inc'' mysql-test/r/ctype_latin2_ch.result: New BitKeeper file ``mysql-test/r/ctype_latin2_ch.result'' mysql-test/r/have_latin2_ch.require: New BitKeeper file ``mysql-test/r/have_latin2_ch.require'' mysql-test/t/ctype_latin2_ch.test: New BitKeeper file ``mysql-test/t/ctype_latin2_ch.test''
* | | | Bug#18004 Connecting crashes server when default charset is UCS2unknown2006-03-204-3/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table.cc: Fixing to use system_charset_info instead of default_charset_info. Crash happened because the "ctype" array is empty in UCS2, and thus cannot be used with my_isspace(). The reason why UCS2 appeared in this context was because of of default_charset_info variable incorrectly substituted to my_isspace(). As functions check_db_name(), check_table_name() and check_column_name() always get values in utf8, system_charset_info must be used instead. ctype_ucs2_def.test, ctype_ucs2_def-master.opt, ctype_ucs2_def.result: new file sql/table.cc: Bug#18004 Connecting crashes server when default charset is UCS2 Use of default_charset_info was wrong. Functions check_db_name, check_table_name and check_column_name get values of system_charset_info character set (utf8).
* | | BUG#18283 When InnoDB returns error 'lock table full', MySQL can writeunknown2006-03-171-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to binlog too much. When InnoDB has to rollback a transaction because the lock table has filled up, it also needs to inform the upper layer that the transaction was rolled back so that the cached transaction is not written to the binary log. sql/ha_innodb.cc: When InnoDB rolls back a transaction in HA_ERR_LOCK_TABLE_FULL, it needs to inform the upper layer to rollback the transaction also.
* | | Fix bug in mysql-test-run.pl in ^C signal handler.unknown2006-03-161-0/+6
| |/ |/| | | | | | | | | | | mysql-test/lib/mtr_timer.pl: Fix bug where ^C would trigger cleanup handler in both parent and timeout child processes, causing duplicated messages and potential conflicts.
* | Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2006-03-131-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged
| * | bug#14028 -unknown2006-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | ndb crash if trigger record get to big, fix incorrect max size of trigger record ndb/src/kernel/blocks/backup/Backup.cpp: Increase size of max trigger record
* | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-131-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
| * | | bug#18040 - ndb online index buildunknown2006-03-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (not possible from SQL in 4.1 & 5.0) ndb/src/kernel/blocks/suma/Suma.hpp: fix incorrect union
* | | | Merge mysql.com:/home/mydev/mysql-4.1unknown2006-03-109-3/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-bug14980
| * | | | Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEXunknown2006-03-109-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For "count(*) while index_column = value" an index read is done. It consists of an index scan and retrieval of each key. For efficiency reasons the index scan stores the key in the special buffer 'lastkey2' once only. At the first iteration it notes this fact with the flag HA_STATE_RNEXT_SAME in 'info->update'. For efficiency reasons, the key retrieval for blobs does not allocate a new buffer, but uses 'lastkey2'... Now I clear the HA_STATE_RNEXT_SAME flag whenever the buffer has been polluted. In this case, the index scan copies the key value again (and sets the flag again). include/my_base.h: Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX Changed the comment for HA_STATE_RNEXT_SAME as a warning for future uses. myisam/mi_delete.c: Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX Removing the flag HA_STATE_RNEXT_SAME from info->update if info->lastkey2 was reused for another purpose than index scanning. myisam/mi_key.c: Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX Removing the flag HA_STATE_RNEXT_SAME from info->update if info->lastkey2 was reused for another purpose than index scanning. myisam/mi_rnext_same.c: Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX Removed trailing space and fixed a comment. myisam/mi_unique.c: Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX Removing the flag HA_STATE_RNEXT_SAME from info->update if info->lastkey2 was reused for another purpose than index scanning. myisam/mi_update.c: Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX Removing the flag HA_STATE_RNEXT_SAME from info->update if info->lastkey2 was reused for another purpose than index scanning. myisam/mi_write.c: Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX Removing the flag HA_STATE_RNEXT_SAME from info->update if info->lastkey2 was reused for another purpose than index scanning. mysql-test/r/myisam.result: Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX Added test result. mysql-test/t/myisam.test: Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX Added test.
* | | | | Merge mysql.com:/M41/comment-4.1 into mysql.com:/M41/mysql-4.1unknown2006-03-100-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | scripts/make_binary_distribution.sh: Auto merged
| * \ \ \ \ Merge mysql.com:/M40/comment-4.0 into mysql.com:/M41/comment-4.1unknown2006-03-021-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/make_binary_distribution.sh: Auto merged
* | | | | | | mysql-test-run.pl, mtr_cases.plunknown2006-03-083-28/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Back porting of some changes in later releases - Corrected valgrind support - Removed work around for TZ needed in VisualStudio 6 - Don't restart master to add special settings from "<testcase>-master.opt", if same settngs as running master, feature request in bug#12433 - With --reorder, keep tests with same *-master.opt content together, to save even more master restarts mysql-test/lib/mtr_misc.pl: Added functions to compare lists of options mysql-test/lib/mtr_cases.pl: Removed special code for Windows as in VC6 we unset TZ to avoid library bug mysql-test/mysql-test-run.pl: Handle pseudo option --timezone=<spec> that sets TZ
* | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2006-03-083-0/+59
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137
| * | | | | | | Bug#17137 Running "truncate table" on temporary table leaves the table open ↵unknown2006-03-083-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on a slave - Decrease "slave_open_temp_tables" during reopen of truncated table. - Add test "rpl_trunc_temp" sql/sql_delete.cc: Decrease "slave_open_temp_tables" after temporary table has been closed, it will be increased again when the temp table is reopened after it's been truncated. mysql-test/r/rpl_trunc_temp.result: New BitKeeper file ``mysql-test/r/rpl_trunc_temp.result'' mysql-test/t/rpl_trunc_temp.test: New BitKeeper file ``mysql-test/t/rpl_trunc_temp.test''
* | | | | | | | mysql-test-run.pl:unknown2006-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow space in base directory path, bug#15736 mysql-test/mysql-test-run.pl: Allow space in base directory path, bug#15736
* | | | | | | | mergedunknown2006-03-063-12/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | kill (subquery) - three years old bugfix that never workedunknown2006-03-063-10/+12
| | | | | | | | |
* | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-063-3/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b15949
| * | | | | | | | | Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)unknown2006-03-013-3/+22
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | union.result, union.test: Adding test case. item.cc: Allow safe character set conversion in UNION - string constant to column's charset - to unicode Thus, UNION now works the same with CONCAT (and other string functions) in respect of aggregating arguments with different character sets. sql/item.cc: Allow character set conversion in UNION - string to column's charset - to unicode Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE) mysql-test/t/union.test: Adding test case. mysql-test/r/union.result: Adding test case.
* | | | | | | | | Fix for bug#14385 GRANT and mapping to correct user account problemsunknown2006-03-063-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if the host of table hash record exactly matches host from GRANT command mysql-test/r/grant.result: Fix for bug#14385 GRANT and mapping to correct user account problems test case mysql-test/t/grant.test: Fix for bug#14385 GRANT and mapping to correct user account problems test case
* | | | | | | | | Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error":unknown2006-03-052-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it breaks binary compatibility. The patch will be left intact in 5.1. libmysql/libmysql.c: Revert the changeset for Bug#16144: it breaks binary compatibility. tests/mysql_client_test.c: Revert the changeset for Bug#16144: it breaks binary compatibility.
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-046-6/+48
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-4.1-root mysql-test/r/heap.result: Auto merged mysql-test/t/heap.test: Auto merged
| * | | | | | | | | Remove 'delayed' to make the test deterministic (alreadyunknown2006-02-234-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed in 5.0). A post-review fix (Bug#13134) mysql-test/r/heap.result: Remove 'delayed' to make the test deterministic. mysql-test/r/ps.result: Remove an unneeded drop table (test case for Bug#13134) mysql-test/t/heap.test: Remove 'delayed' to make the test deterministic. mysql-test/t/ps.test: A post-review fix (Bug#13134)
| * | | | | | | | | A fix and a test case for Bug#13134 "Length of VARCHAR() utf8 unknown2006-02-216-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | column is increasing when table is recreated with PS/SP": make use of create_field::char_length more consistent in the code. Reinit create_field::length from create_field::char_length for every execution of a prepared statement (actually fixes the bug). mysql-test/r/ps.result: Test results fixed (Bug#13134) mysql-test/t/ps.test: A test case for Bug#13134 "Length of VARCHAR() utf8 column is increasing when table is recreated with PS/SP" sql/field.cc: Move initialization of create_field::char_length to the constructor of create_field. sql/field.h: Rename chars_length to char_length (to be consistent with how this term is used throughout the rest of the code). sql/sql_parse.cc: Initialize char_length in add_field_to_list. This function effectively works as another create_field constructor. sql/sql_table.cc: Reinit length from char_length for every field in mysql_prepare_table. This is not needed if we're executing a statement for the first time, however, at subsequent executions length contains the number of bytes, not characters (as it's expected to).
* | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1unknown2006-03-041-28/+75
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-bug11527
| * | | | | | | | | | Bug#11527 - Setting myisam_repair_threads to >1 leads to corruptionunknown2006-02-161-28/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A wrong cast led to numeric overflow for data files greater than 4GB. The parallel repair assumed end of file after reading the amount of data that the file was bigger than 4GB. It truncated the data file and noted the number of records it found so far in the index file header as the number of rows in the table. Removing the cast fixed the problem. I added some cosmetic changes too. The normal repair worked because it uses a different function to read from the data file. mysys/mf_iocache.c: Bug#11527 - Setting myisam_repair_threads to >1 leads to corruption The pure fix was to remove a cast from a file offset difference. Supplemented this with warnings in function comments, a change from == to <= to be slightly more safe, a renaming from "read_len" to "left_length" to make the partial code duplication between _my_b_read() and _my_b_read_r() more obvious and easier to compare the functions, removed another unnecessary (but harmless) cast, and fixed coding sytle around the "left_length" changes.