summaryrefslogtreecommitdiff
path: root/myisam
Commit message (Collapse)AuthorAgeFilesLines
* Merge april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1unknown2006-01-231-0/+4
|\ | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/BUG16489/mysql-5.0 myisam/ft_update.c: Auto merged mysql-test/r/fulltext2.result: Auto merged
| * BUG#16489 - utf8 + fulltext leads to corrupt index file.unknown2006-01-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixed that UPDATE statement crashes multi-byte charset fulltext index. myisam/ft_update.c: Fixed that UPDATE statement crashes multi-byte charset fulltext index. While updating, always rewrite multi-byte charset fulltext index. mysql-test/r/fulltext2.result: Added a testcase for BUG#16489. mysql-test/t/fulltext2.test: Added a testcase for BUG#16489.
* | mergedunknown2006-01-033-2/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myisam/mi_delete.c: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_func.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged
| * | many warnings (practically safe but annoying) correctedunknown2006-01-033-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqladmin.cc: don't use the handler after it's closed client/mysqlbinlog.cc: memory leak client/mysqldump.c: many "ignore return value" warnings, one "NULL dereference" cmd-line-utils/libedit/history.c: memory leak include/my_base.h: cleanup libmysql/libmysql.c: "return value ignored" warning myisam/mi_delete.c: "return value ignored" warning myisam/myisampack.c: "out-of-bound access" warning myisam/sort.c: "double free" warning mysys/default_modify.c: "double free" warning mysys/mf_iocache2.c: "return value ignored" warnings mysys/my_bitmap.c: s/return/DBUG_RETURN/ mysys/my_error.c: memory leak server-tools/instance-manager/parse.cc: "NULL dereference" warning sql-common/client.c: "NULL dereference" warning sql/field.cc: deadcode, "NULL dereference", "uninitialized" warnings sql/field.h: unused parameters removed from constructor sql/ha_myisam.cc: "return value ignored" warnings sql/item.cc: "return value ignored" warnings changed constructor sql/item_func.cc: "return value ignored" warnings sql/log_event.cc: uninitialized warning sql/opt_range.cc: "double free" and uninitialized warnings sql/opt_range.h: "return value ignored" warning sql/repl_failsafe.cc: "return value ignored" warning sql/set_var.cc: "return value ignored" warning sql/slave.cc: "return value ignored" warnings sql/slave.h: new prototype sql/sql_acl.cc: deadcode and "NULL dereference" warnings sql/sql_db.cc: "return value ignored" warning sql/sql_handler.cc: "NULL dereference" warning sql/sql_help.cc: "NULL dereference" warning sql/sql_insert.cc: "return value ignored" warning sql/sql_parse.cc: "return value ignored" warning one more DBUG_ASSERT sql/sql_repl.cc: "return value ignored" and memory leak warnings sql/sql_show.cc: "return value ignored" and "NULL dereference" warnings sql/sql_test.cc: "return value ignored" warning sql/table.cc: memory leak sql/uniques.cc: "return value ignored" warning endspaces deleted
* | | Merge mysql.com:/home/stewart/Documents/MySQL/4.1/mainunknown2005-12-281-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/5.0/main client/mysql.cc: Auto merged myisam/mi_delete.c: Auto merged mysql-test/r/fulltext2.result: Auto merged ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged sql/mysqld.cc: Auto merged
| * | BUG#11336 - fulltext index corruption after repair_by_sort and mi_deleteunknown2005-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for uca collation isalnum and strnncollsp don't agree on whether 0xC2A0 is a space (strnncollsp is right, isalnum is wrong). they still don't, the bug was fixed by avoiding strnncollsp
| * | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0unknown2005-12-042-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 client/mysql.cc: Auto merged client/mysqladmin.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged isam/isamchk.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Merged from 4.0.
| | * | A set of Netware related patches.unknown2005-12-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Fixed option name. client/mysqladmin.c: Fixed option name. client/mysqlbinlog.cc: Fixed option name. client/mysqlcheck.c: Fixed option name. client/mysqldump.c: Fixed option name. client/mysqlimport.c: Fixed option name. client/mysqlshow.c: Fixed option name. isam/isamchk.c: Fixed option name. myisam/myisamchk.c: Fixed option name. myisam/myisampack.c: Fixed option name. sql/sql_parse.cc: Fix problem with kill connection on NetWare.
* | | | locking issues,unknown2005-12-231-2/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test for LONGLONG_MIN in decimal.c myisam/mi_create.c: lock THR_LOCK_myisam later mysys/thr_alarm.c: remove misplaced comment and "safety" if() server-tools/instance-manager/instance.cc: add unlock strings/decimal.c: correct the test for LONGLONG_MIN. fix debug sprintf
* | | Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-011-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into selena.:H:/MYSQL/src/#14902-mysql-5.0 mysql-test/r/analyze.result: SCCS merged mysql-test/t/analyze.test: SCCS merged
| * | | Fixes bug #14902. When analysing a table with FT index that contains stopwordsunknown2005-11-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table statistics is not updated, so the next execution of analyze table will try to update statistics again. mysql-test/r/analyze.result: Updated result file for bug #14902 test. mysql-test/t/analyze.test: Test for bug #14902.
* | | | Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1unknown2005-11-261-1/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0 myisam/ft_parser.c: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/t/fulltext.test: Auto merged
| * | | followup for for the bug#5686unknown2005-11-261-1/+3
| | | |
* | | | Merge the last 5.0.16 (Unix, Windows) and 5.0.16a (Netware) changes to the ↵unknown2005-11-212-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | general tree. client/mysql.cc: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged mysys/my_create.c: Auto merged mysys/my_open.c: Auto merged sql/log.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_repl.cc: Auto merged configure.in: Manual merge - new version (17) takes precedence.
| * | | | Netware specific changes for 5.0.16aunknown2005-11-182-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Fixed option. client/mysqladmin.cc: Fixed option. client/mysqlbinlog.cc: Fixed option. client/mysqlcheck.c: Fixed option. client/mysqldump.c: Fixed option. client/mysqlimport.c: Fixed option. client/mysqlshow.c: Fixed option. configure.in: Changed version for Netware. myisam/myisamchk.c: Fixed option. myisam/myisampack.c: Fixed option. netware/mysql_test_run.c: NetWare specific changes: Define MYSQL_CHECK environment variable to make mysqlcheck test case pass
* | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-11-151-1/+3
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0 myisam/ft_parser.c: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/t/fulltext.test: Auto merged
| * | Fix for BUG#5686 - #1034 - Incorrect key file for table - only utf8unknown2005-11-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | myisam/ft_parser.c: word->len calculation correction. mysql-test/r/fulltext.result: Test case for bug#5686. mysql-test/t/fulltext.test: Test case for bug#5686.
| * | Merge mysql.com:/home/psergey/mysql-4.1-bug13814unknown2005-11-081-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-nov08-push
| | * | Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB ↵unknown2005-10-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key segment, do advance the source pointer over 2 bytes that specify value length. myisam/mi_key.c: Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment, do advance the source pointer over 2 bytes that specify value length (for NULL value the format is: null_marker 0x01, value length 0x00 0x00, data: 0x00 keyseg->length times). We need to advance over 2 bytes separately as keyseg->length doesn't include them. mysql-test/r/myisam.result: Testcase for BUG#13814 mysql-test/t/myisam.test: Testcase for BUG#13814
* | | | Manually mergedunknown2005-11-011-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/r/update.result: Auto merged mysql-test/t/update.test: Auto merged sql/item_timefunc.h: Auto merged sql/spatial.cc: Auto merged sql/sql_select.h: Auto merged BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Auto merged
| * | | Review of new pushed codeunknown2005-11-011-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort) Mark that add_time(), time_diff() and str_to_date() can return null values myisam/mi_check.c: keyoffset is not a position (no %lx here) mysql-test/r/func_sapdb.result: Fixed test after marking that timediff() can return NULL sql/item_func.cc: Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort) sql/item_timefunc.cc: Mark that add_time and str_to_date() can return null values sql/item_timefunc.h: Mark that time_diff can return 0 sql/spatial.cc: Simple cleanups during review of new code
* | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1unknown2005-10-278-56/+243
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp heap/_check.c: Auto merged heap/hp_create.c: Auto merged include/config-netware.h: Auto merged include/my_base.h: Auto merged include/my_handler.h: Auto merged include/myisam.h: Auto merged innobase/include/Makefile.am: Auto merged myisam/mi_check.c: Auto merged myisam/mi_delete.c: Auto merged myisam/mi_rnext_same.c: Auto merged myisam/mi_search.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamdef.h: Auto merged myisam/sort.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/update.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/select.test: Auto merged mysql-test/t/update.test: Auto merged mysys/my_getopt.c: Auto merged mysys/my_handler.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_myisam.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/records.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_select.cc: Auto merged sql/structs.h: Auto merged strings/conf_to_src.c: Auto merged strings/ctype-win1250ch.c: Auto merged Makefile.am: Merged from 4.1 myisam/myisamchk.c: Merged from 4.1 mysql-test/mysql-test-run.pl: Merged from 4.1 mysql-test/r/insert_select.result: Merged from 4.1 mysql-test/r/myisam.result: Merged from 4.1 mysql-test/r/select.result: Merged from 4.1 mysql-test/t/insert_select.test: Merged from 4.1 mysql-test/t/myisam.test: Merged from 4.1 netware/mysql_test_run.c: Merged from 4.1 sql/item.cc: Merged from 4.1 sql/mysqld.cc: Merged from 4.1 sql/sql_update.cc: Merged from 4.1 tests/mysql_client_test.c: Merged from 4.1
| * | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-252-5/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 myisam/mi_check.c: Auto merged
| | * | Changed some dbug print options.unknown2005-10-252-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | myisam/mi_check.c: Changed print style for keyoffset. myisam/mi_delete.c: Changed print style for keypos.
| * | | Added more tests for new UPDATE ... ORDER BY ... LIMIT optimizationunknown2005-10-254-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | heap/_check.c: Change arguments to ha_key_cmp heap/hp_create.c: Change arguments to ha_key_cmp include/my_base.h: Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument myisam/mi_check.c: Change arguments to ha_key_cmp myisam/mi_rnext_same.c: Change arguments to ha_key_cmp myisam/mi_search.c: Change arguments to ha_key_cmp myisam/mi_write.c: Change arguments to ha_key_cmp myisammrg/myrg_queue.c: Change arguments to ha_key_cmp mysys/my_handler.c: Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument (This removes an if in a loop at the expensive of an int on the stack) sql/records.cc: Simplify new rr_index() code Create common error handling function for rr_() functions. Remove loop from rr_index() as handler::index_next() can never return HA_ERR_RECORD_DELETED sql/sql_load.cc: Simplify sql/sql_update.cc: Simplify code Fixed bug when one is updating an index column that could be used with ORDER BY sql/structs.h: Removed not needed structure element
| * | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-234-28/+211
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2 sql/mysqld.cc: Auto merged
| | * | BUG#9622: post-review-fixes: better commentsunknown2005-10-231-22/+32
| | | |
| | * | BUG#9622, stage 2, work together with fix for BUG#12232:unknown2005-10-214-21/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added "nulls_ignored" index statistics collection method for MyISAM tables. (notification trigger: this is about BUG#9622). include/my_base.h: BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method: Added SEARCH_RETURN_B_POS flag for ha_key_cmp() include/my_handler.h: BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method: added ha_find_null() include/myisam.h: BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method. myisam/mi_check.c: BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method, added mi_collect_stats_*(), updated update_key_parts() to deal with all 3 methods. myisam/myisamchk.c: BUG#9622: Added nulls_ignored index statistics collection method for MyISAM myisam/myisamdef.h: BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method. myisam/sort.c: BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method. mysql-test/r/myisam.result: Testcase for BUG9622 mysql-test/t/myisam.test: Testcase for BUG9622 mysys/my_handler.c: BUG#9622: ha_key_cmp() now supports new SEARCH_RETURN_B_POS flag, added ha_find_null() sql/ha_myisam.cc: BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method. sql/mysqld.cc: BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
* | | | 1.2048 05/10/20 10:31:16 ingo@mysql.com +1 -0unknown2005-10-261-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#12166 - Unable to index very large tables Moved clearing of errors behind the second repair attempt, but will clear only if no error happened. No test case. The error can be repeated with little free space on tmpdir only. I do not know of a way to create this in a portable way with our test suite. I did however attach a shell script to the bug report which can easily be adapted to the situation on the test machine. myisam/mi_check.c: Bug#12166 - Unable to index very large tables Changed comments. Removed unnecessary use of param->keys_in_use. sql/ha_myisam.cc: Bug#12166 - Unable to index very large tables Moved clearing of errors behind the second repair attempt, but will clear only if no error happened.
* | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-10-151-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-5.0.12991 myisam/mi_check.c: Auto merged
| * | | | Fix for bug #12991 (compile error --without-geometry)unknown2005-09-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | myisam/mi_check.c: this code shouldn't be compiled without Rtree keys's support
* | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmpunknown2005-10-131-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 configure.in: Auto merged include/config-win.h: Auto merged include/m_string.h: Auto merged include/my_pthread.h: Auto merged myisam/mi_search.c: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/select.test: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_alarm.c: Auto merged netware/pack_isam.def: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-tis620.c: Auto merged strings/xml.c: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged mysql-test/r/select.result: Merged from 4.1. netware/BUILD/mwenv: Merged from 4.1. scripts/make_binary_distribution.sh: Merged from 4.1. sql/mysqld.cc: Merged from 4.1. sql/sql_show.cc: Merged from 4.1. strings/my_strtoll10.c: Merged from 4.1.
| * | | | Merge mysql.com:/usr/home/ram/work/mysql-4.0unknown2005-10-131-1/+1
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-4.1 myisam/mi_search.c: Auto merged include/m_string.h: SCCS merged
| | * | memcpy_overlap() removed, as unknown2005-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. it's wrong to use memcpy() for overlapped areas; 2. we use it only once. During merge to 4.1 will remove a memcpy_overlap() call from strings/ctype-tis620.c as well in order to fix bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64. myisam/mi_search.c: use memmove() instead, as memcpy_overlap() is removed.
* | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1unknown2005-10-102-22/+27
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/users/lthalmann/bk/mysql-5.0 myisam/mi_rkey.c: Auto merged mysql-test/r/subselect2.result: Auto merged mysql-test/t/select.test: Auto merged ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged scripts/make_binary_distribution.sh: Auto merged configure.in: After merge fixes myisam/mi_search.c: After merge fixes mysql-test/r/select.result: After merge fixes sql/item.cc: After merge fixes sql/sql_parse.cc: After merge fixes sql/sql_update.cc: After merge fixes
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-072-22/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | * | | Review of new code since last pullunknown2005-10-072-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use %lx instead of %p as %p is not portable - Don't replace ROW item with Item_null myisam/mi_rkey.c: Use %lx instead of %p as %p is not portable myisam/mi_search.c: Use %lx instead of %p as %p is not portable mysql-test/r/select.result: More test for ROW comparison mysql-test/t/select.test: More test for ROW comparison sql/item.cc: We can't replace a ROW item with Item_null because: - Arg_comparator is still using the orignal row items and it's not good to have args[0] different from what is actually compared - If we are using the <=> comparator, NULL can still be compared as true - We would break things if we would ever use resolve_const_item() for operators like >, < etc.
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-082-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0 server-tools/instance-manager/mysql_connection.cc: Auto merged sql/sql_parse.cc: Auto merged
| * | | | | pthread_handler_decl() changed to be ctags-friendlyunknown2005-10-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (and contain extern "C" when necessary)
* | | | | | Merge mysql.com:/home/dellis/mysqlab/bk/local_mysql-4.1unknown2005-10-061-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | into mysql.com:/home/dellis/mysqlab/bk/mysql-5.0
| * | | | Fix for BUG#13582. Theoretically possible to try to overallocate RAM in ↵unknown2005-09-281-1/+2
| |/ / / | | | | | | | | | | | | some fulltext queries.
| * | | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-09-264-7/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
* | \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-309-16/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc myisam/mi_open.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamdef.h: Auto merged myisam/myisampack.c: Auto merged sql/sql_parse.cc: Auto merged
| * | | | | CHECKSUM TABLE now allows concurrent insertsunknown2005-09-279-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myisam/mi_check.c: info->s->state.checksum moved to info->state->checksum myisam/mi_delete.c: info->s->state.checksum moved to info->state->checksum myisam/mi_delete_all.c: info->s->state.checksum moved to info->state->checksum myisam/mi_open.c: info->s->state.checksum moved to info->state->checksum myisam/mi_update.c: info->s->state.checksum moved to info->state->checksum myisam/mi_write.c: info->s->state.checksum moved to info->state->checksum myisam/myisamchk.c: info->s->state.checksum moved to info->state->checksum myisam/myisamdef.h: info->s->state.checksum moved to info->state->checksum myisam/myisampack.c: info->s->state.checksum moved to info->state->checksum mysql-test/r/system_mysql_db.result: result fixed sql/ha_myisam.cc: info->s->state.checksum moved to info->state->checksum
* | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-308-19/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc client/mysqltest.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamdef.h: Auto merged sql/item.h: Auto merged sql/item_sum.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged
| * | | | | Several fixes revelaled by Intel compiler.unknown2005-09-238-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmd-line-utils/readline/complete.c: Added a cast. dbug/my_main.c: Added an include to avoid implicit declaration of my_thread_global_init() include/my_global.h: undef cannot be used on this predefined name. Since it is a custom fix for gcc 2.8.0, let's make it only effective in that case. include/my_sys.h: Added a new type, TYPE_NOT_SET. myisam/ft_boolean_search.c: Added casts. myisam/mi_key.c: Added cast. myisam/mi_open.c: Added cast. Changed function types. myisam/mi_test1.c: Added cast. myisam/myisamchk.c: Added cast. myisam/myisamdef.h: Changed function type. myisam/myisampack.c: Added casts. myisam/sp_key.c: Added cast. mysys/mf_iocache.c: Fixed invalid use of 0 to info->type. According to comment it should not have been set, but in earlier code by setting it to 0 would have been same as setting it to READ_CACHE. This probably was not desired, potential bug. server-tools/instance-manager/instance_options.cc: Fixed a typo. server-tools/instance-manager/protocol.cc: Changed enum to int. Changed char to uchar. Added casts. sql/mysql_priv.h: Bit overflow. sql/sql_base.cc: Removed unused label. The code below label was unused too, because there is a return just before. sql/sql_parse.cc: Removed unneccessary extra argument.
* | | | | | Merge mysql.com:/home/mydev/mysql-5.0unknown2005-09-254-7/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-5000
| * \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.1-4100unknown2005-09-234-7/+21
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-5000 myisam/mi_dbug.c: Auto merged myisam/mi_rkey.c: Auto merged myisam/mi_search.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/t/merge.test: Auto merged
| | * | | | Merge mysql.com:/home/mydev/mysql-4.0-4000unknown2005-09-234-7/+21
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100 myisam/mi_dbug.c: Auto merged myisam/mi_rkey.c: Auto merged myisam/mi_search.c: Auto merged myisam/myisamdef.h: Auto merged myisammrg/myrg_rkey.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Manual merge mysql-test/r/merge.result: Bug#9112 - Merge table with composite index producing invalid results with some queries Manual merge mysql-test/t/merge.test: Bug#9112 - Merge table with composite index producing invalid results with some queries Manual merge
| | | * | | Bug#9112 - Merge table with composite index producing invalid results with ↵unknown2005-09-234-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some queries The problem was an ab-use of last_rkey_length. Formerly we saved the packed key length (of the search key) in this element. But in certain cases it got replaced by the (packed) result key length. Now we use a new element of MI_INFO to save the packed key length of the search key. myisam/mi_dbug.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Fixed the recognition of NULL values in _mi_print_key(). myisam/mi_rkey.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Saved the packed key length in a new element of MI_INFO. myisam/mi_search.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Added a comment and trace prints. myisam/myisamdef.h: Bug#9112 - Merge table with composite index producing invalid results with some queries Added a new element to store the packed key length for use by the MyISAMMRG engine. myisammrg/myrg_rkey.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Changed to use the new element of MI_INFO to get at the packed key length. mysql-test/r/merge.result: Bug#9112 - Merge table with composite index producing invalid results with some queries The test result. mysql-test/t/merge.test: Bug#9112 - Merge table with composite index producing invalid results with some queries The test case.
View Lorry Controller Status