Commit graph

841 commits

Author SHA1 Message Date
unknown
b753fd96b2 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-15 17:16:42 +02:00
unknown
65255d3540 don't check record's checksum in REPAIR
myisam/mi_dynrec.c:
  new parameter for _mi_rec_check().
myisam/myisamdef.h:
  new parameter for _mi_rec_check().
2005-04-11 20:04:50 +02:00
unknown
7ff8fc73c9 Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
Since 4.1 keys are compared with trailing spaces. 
Thus, a "x " key can be inserted between a couple of "x" keys.
The existing code did not take this into account. Though the
comments in the code claimed it did.


myisam/mi_search.c:
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  Fixed some function comments.
  In the case when we insert a different key between two identical keys,
  the difference must be additional spaces. In this case the prefix is 
  the same as that of the new key instead of the (zero) remaining length.
myisam/mi_write.c:
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  Fixed a function comment.
mysql-test/r/myisam.result:
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  The test result.
mysql-test/t/myisam.test:
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  The test case.
2005-04-08 14:13:02 +02:00
unknown
ed124ab6b7 myisamchk.c:
Wrong help string fix.


myisam/myisamchk.c:
  Wrong help string fix.
2005-03-24 18:21:56 +04:00
unknown
5d7c76aa0a myisam/myisam_ftdump.c
recalculate stats/gws for the last word in the index too
    remove unused code


myisam/myisam_ftdump.c:
  recalculate stats/gws for the last word in the index too
  remove unused code
2005-03-09 12:59:20 +01:00
unknown
870059eb04 myisam/ft_parser.c
protection against invalid string in ft_get_word
mysys/my_symlink2.c
    typo fixed


myisam/ft_parser.c:
  protection against invalid string in ft_get_word
mysys/my_symlink2.c:
  typo fixed
2005-03-06 12:31:40 +01:00
unknown
f97fd0f0b7 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.1-4100


myisam/mi_create.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-03-04 09:35:21 +01:00
unknown
555ea37d77 Fix for a build bug.
Added a missing comma.
2005-03-04 09:30:22 +01:00
unknown
9210c01cac merge
include/my_global.h:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/table.cc:
  Auto merged
2005-03-03 23:07:20 +01:00
unknown
8104faa083 Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
include/my_global.h:
  O_NOFOLLOW
isam/create.c:
  create table files with O_EXCL|O_NOFOLLOW
merge/mrg_create.c:
  create table files with O_EXCL|O_NOFOLLOW
myisam/mi_create.c:
  create files of temporary tables with O_EXCL|O_NOFOLLOW
myisammrg/myrg_create.c:
  create table files with O_EXCL|O_NOFOLLOW
mysys/mf_tempfile.c:
  create temporary files with O_EXCL|O_NOFOLLOW
sql/ha_myisam.cc:
  let mi_create know if the table is TEMPORARY
sql/mysql_priv.h:
  --allow_suspicious_udfs
sql/mysqld.cc:
  --allow_suspicious_udfs
sql/share/english/errmsg.txt:
  typo
sql/sql_udf.cc:
  --allow_suspicious_udfs
  don't allow xxx() udf without any of xxx_init/deinit/add/reset
  check paths when loading from mysql.func
sql/table.cc:
  create frm of temporary table with O_EXCL|O_NOFOLLOW
2005-03-03 19:51:29 +01:00
unknown
26f75ffc83 Bug#8306 - TRUNCATE leads to index corruption
Added a check, if the table, which we are going to create, is open.
This can happen if a MERGE mapped table is TRUNCATEd.


myisam/mi_open.c:
  Bug#8306 - TRUNCATE leads to index corruption
  Made test_if_reopen() globally available.
myisam/myisamdef.h:
  Bug#8306 - TRUNCATE leads to index corruption
  Declared test_if_reopen() as globally available.
mysql-test/r/myisam.result:
  Bug#8306 - TRUNCATE leads to index corruption
  The test result.
mysql-test/t/myisam.test:
  Bug#8306 - TRUNCATE leads to index corruption
  The test case.
2005-03-02 10:35:00 +01:00
unknown
209b24473c Bug#8349 myisamchk: --set-charset does not work
What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message. 


include/mysys_err.h:
  New mysys error message "unknown collation".
mysys/charset.c:
  Display more proper error when a collation is not found.
mysys/errors.c:
  New "unknown collation" error.
2005-02-22 16:37:25 +04:00
unknown
cfa78c2645 Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
Backporting Monty's fix for 5.0 into 4.1.
2005-02-18 16:10:12 +04:00
unknown
5b91c5a73c Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-02-18 15:52:59 +04:00
unknown
d76b88b65c Fix for the bug #7344 (multiple server_init/server_end lead to crash)
Some variable wasn't moved to the initial state during mysql_server_end


myisam/ft_stopwords.c:
  resetting ft_stopword_file
sql/mysqld.cc:
  free_charsets() call added
2005-02-18 15:51:55 +04:00
unknown
1218a7c20c Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
into mysql.com:/home/dellis/bkl/bug-4.1


BitKeeper/etc/logging_ok:
  auto-union
myisam/ft_nlq_search.c:
  Auto merged
2005-02-15 17:30:40 -06:00
unknown
3be01953d1 ft_nlq_search.c:
Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)


myisam/ft_nlq_search.c:
  Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-15 17:27:23 -06:00
unknown
de3f93c6ff Bug#8351
Fix for crash when using a double quote in boolean fulltext query.


mysql-test/r/fulltext.result:
  Added a test case for bug #8351.
mysql-test/t/fulltext.test:
  Added a test case for bug #8351.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-14 18:54:12 +04:00
unknown
01e96c5bcd Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 00:10:07 +01:00
unknown
bae820dc66 make LOAD INDEX to work 2005-02-12 00:05:13 +01:00
unknown
ffe417fdde Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
unknown
8c750c466b indexless boolean fulltext search was depending on default_charset_info - Bug#8159
ftbw->off wasn't cleared on reinit - Bug#8234


include/ft_global.h:
  get rid of default_charset_info in indexless fulltext searches
myisam/ft_boolean_search.c:
  get rid of default_charset_info in indexless fulltext searches
  clear ftbw->off on reinits
myisam/ft_static.c:
  get rid of default_charset_info in indexless fulltext searches
myisam/ftdefs.h:
  get rid of default_charset_info in indexless fulltext searches
sql/ha_myisam.h:
  get rid of default_charset_info in indexless fulltext searches
sql/handler.h:
  get rid of default_charset_info in indexless fulltext searches
sql/item_func.cc:
  get rid of default_charset_info in indexless fulltext searches
2005-02-04 15:24:06 +01:00
unknown
8bdb500105 fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
unknown
3671fe1f72 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-18 11:45:41 +01:00
unknown
f003895df9 myisam/ft_boolean_search.c
-trunc* bug - don't increase yweaks in this case


myisam/ft_boolean_search.c:
  -trunc* bug - don't increase yweaks in this case
mysql-test/r/fulltext.result:
  -trunc* bug - don't increase yweaks in this case
mysql-test/t/fulltext.test:
  -trunc* bug - don't increase yweaks in this case
2005-01-18 11:27:38 +01:00
unknown
96f64b4440 Fixed new bug that caused symlink test to fail
mysys/my_symlink.c:
  More debugging
2005-01-18 03:49:39 +02:00
unknown
0d98da70ad don't ignore errors in readlink 2005-01-15 20:08:53 +01:00
unknown
d942c9a87b Fix for bug #7545 (Undefined symbols if --without-geometry)
myisam/mi_check.c:
  This code should be ifdefed in no HAVE_SPATIAL case
2005-01-03 17:33:04 +04:00
unknown
7f6cc1df6e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-order-bug
2004-12-21 03:02:38 +03:00
unknown
b857b6e763 myisam/sort.c:my_var_write and mysys/hash.c:hash_key made static inline,
not simply inline, to fix the linking failure on Sun Solaris 9 (sparc)
with Sun Studio 9, reported by Peter Harvey.


myisam/sort.c:
  my_var_write made static inline (fix for a link failure)
mysys/hash.c:
  hash_key made static inline (fix a link failure)
2004-12-16 02:43:35 +03:00
unknown
95056a0b65 Fix for bug #6516 (Server crash loading spatial data)
(after discussion with SerG)


include/my_base.h:
  Handler error code added
myisam/mi_write.c:
  New error code handled
myisam/rt_index.c:
  check for zero length added
myisam/sp_key.c:
  zero length check added
mysql-test/r/gis-rtree.result:
  appropriate test result
mysql-test/t/gis-rtree.test:
  test case
sql/handler.cc:
  new error code handling added
2004-12-10 16:06:49 +04:00
unknown
f8c1d3fae4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-07 21:43:12 +01:00
unknown
27c6192e82 allocate a buffer large enough for a longer matching string 2004-12-07 21:41:29 +01:00
unknown
88f1b90a70 Fix for bug #6755 (ALTER TABLE ENABLE KEYS corrupts spatial index)
myisam/mi_check.c:
  Spatial keys should not be filesort-ed.
  Specific function neede to insert key into spatial index
mysql-test/r/gis-rtree.result:
  Appropriate test result
mysql-test/t/gis-rtree.test:
  Test case
2004-12-06 11:42:41 +04:00
unknown
66c3afa363 myisam/mi_packrec.c
more robust checks (catch more corruptions)


myisam/mi_packrec.c:
  more robust checks (catch more corruptions)
2004-12-02 15:14:36 +01:00
unknown
dd59a2d7ea one more test for corrupted compressed MyISAM table 2004-12-01 22:46:39 +01:00
unknown
7ea1621207 Fix and testcase for BUG#6699
myisam/mi_rnext_same.c:
  Fix for BUG#6699: 
    MERGE handler now uses mi_rnext_same() with priority queue, so skip record unpacking if buf==NULL
myisammrg/myrg_rnext_same.c:
  Fix for BUG#6699: 
   make myrg_rnext_same sort always sort records and return them in key order.
mysql-test/r/merge.result:
  Test for BUG#6699
mysql-test/t/merge.test:
  Test for BUG#6699
2004-11-29 06:51:30 +03:00
unknown
6429a0c598 bug#6784
mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos
2004-11-24 23:16:16 +01:00
unknown
5909722f04 harmless "buffer overflow" fixed 2004-11-24 11:01:54 +01:00
unknown
892197ca36 use FT_MAX_WORD_LEN_FOR_SORT instead of HA_FT_MAXBYTELEN when calculating
preferred key block length for ft index
2004-11-23 15:03:16 +01:00
unknown
f57d5412e4 merged
BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/rpl000015.result:
  Auto merged
mysql-test/r/rpl_log_pos.result:
  Auto merged
mysql-test/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
2004-11-22 20:15:48 +01:00
unknown
158d655cc0 "Table file %s was created in MySQL 4.1+" is an error, not a warning 2004-11-22 19:18:35 +01:00
unknown
2934e7ebe6 ft_boolean_search.c:
bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
  bug#6705


mysql-test/r/fulltext.result:
  bug#6705
mysql-test/t/fulltext.test:
  bug#6705
myisam/ft_boolean_search.c:
  bug#6705 - (+trunc1* +trunc2*)
2004-11-22 18:37:30 +01:00
unknown
71da21b2e9 merged
sql/ha_innodb.cc:
  Auto merged
2004-11-17 15:28:37 +01:00
unknown
40e25a305d wrong constant fixed - boolean fulltext searches like "+something +smth*"
were stopping at docid 0xffffffff
2004-11-12 22:55:00 +01:00
unknown
55ae2e7880 After merge fixes
client/mysqldump.c:
  Merge with 4.0 (and reordering of options)
client/mysqltest.c:
  Added DB as a user variable
myisam/mi_check.c:
  Trivial cleanup
mysql-test/r/grant.result:
  Move test to be in same order as in 4.0
mysql-test/r/mix_innodb_myisam_binlog.result:
  Updated results
mysql-test/r/ps_1general.result:
  Updated tests to work after privilege fixes
mysql-test/r/timezone3.result:
  Updated results to 4.1
mysql-test/t/ps_1general.test:
  Updated tests to work after privilege fixes
sql-common/my_time.c:
  Applied sub-second patch from 4.0
sql/sql_acl.cc:
  More debugging
2004-11-12 17:44:17 +02:00
unknown
9ae3dde8b5 mi_write: fix for ft2 when found word (in the tree) has different length as the word to insert
myisam/mi_check.c:
  one more correctness check for CHECK of fulltext indexes
2004-11-11 21:26:24 +01:00
unknown
7e06386ae1 A fix (bug #6309: myisamchk compiled without debug support , --help shows vise versa
bug #6380: mysqlcheck --help prints wrong --debug msg for non-debug version).


client/mysqlcheck.c:
  A fix (bug #6380: mysqlcheck --help prints wrong --debug msg for non-debug version).
myisam/myisamchk.c:
  A fix (bug #6309: myisamchk compiled without debug support , --help shows vise versa).
2004-11-02 13:14:07 +04:00
unknown
13ff3fa4b9 proper max_records estimation for sort-repair of fulltext indexes
mysql-test/t/ctype_utf8.test:
  bad merge fixed
2004-10-29 14:24:06 +02:00
unknown
11ff375efd - Applied some Windows portability fixes for myisampack.c and sql_handler.cc
(backports from fixes made in 4.1)


myisam/myisampack.c:
   - replaced "1ULL" with "((ulonglong)1)" to resolve a compile error on
     Windows
sql/sql_handler.cc:
   - removed some unused variables
   - added a (byte*) cast to fix a compile error on Windows (backport of a
     fix made in 4.1)
2004-10-27 21:51:27 +02:00