mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31228 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1075 commits

Author SHA1 Message Date
monty@mysql.com
b4e92e6360 Merge with 4.0 2005-05-14 00:01:40 +03:00
monty@mysql.com
9b39f8304e Fixed wrong buffer usage for auto-increment key with blob part that caused CHECK TABLE to report that the table was wrong. (Bug #10045) 2005-05-13 23:08:29 +03:00
monty@mishka.local
2d25da2a4b concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 
myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors
 2005-05-13 12:08:08 +03:00
ingo@mysql.com
be34b54e1d Merge mysql.com:/home/mydev/mysql-4.1-4100 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-28 19:34:05 +02:00
ingo@mysql.com
286e204ac9 Bug#8321 - myisampack bug in compression algorithm 
Merge from 4.0.
 2005-04-28 16:09:53 +02:00
ingo@mysql.com
66a158a9db Bug#8321 - myisampack bug in compression algorithm 
This is the second of three changesets. It contains the pure bug fix.
It also contains the second after-review fixes.
The problem was that with gcc on x86, shifts are done modulo word size. 
'value' is 32 bits wide and shifting it by 32 bits is a no-op.
This was triggered by an evil distribution of character incidences. 
A distribution of 2917027827 characters made of 202 distinct values led to
34 occurrences of 32-bit Huffman codes.
This might have been the first time ever that write_bits() had to write
32-bit values. Since it can be expected that one day even 32 bits might
be insufficient, the third changeset suggests to enlarge some variables
to 64 bits.
 2005-04-28 15:27:42 +02:00
joerg@mysql.com
a0cac19e6e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-04-26 19:11:54 +02:00
ramil@mysql.com
db2b729c73 A fix (bug #10176: problem with varchar keys). 2005-04-26 19:46:52 +05:00
joerg@mysql.com
49ac2dac3e Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497). 
Post-merge fix will follow.
 2005-04-26 12:03:37 +02:00
joerg@mysql.com
48ba5e4956 Step 1 of the switch to support configuration with NPTL: 
Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.
 2005-04-20 20:10:28 +02:00
ingo@mysql.com
e6b8c52808 Merge mysql.com:/home/mydev/mysql-4.1-bug9188 
into mysql.com:/home/mydev/mysql-5.0-bug9188
 2005-04-16 21:01:46 +02:00
ingo@mysql.com
37537b4b2d Merge mysql.com:/home/mydev/mysql-4.1-bug9487 
into mysql.com:/home/mydev/mysql-4.1-bug9188
 2005-04-16 20:56:21 +02:00
ingo@mysql.com
ab0acbe14d Merge 2005-04-16 17:58:11 +02:00
ingo@mysql.com
e2cf8b309e Bug#9487 - myisampack segmentation violation and bus error 
Fixed some casts for 64-bit systems.
Fixed a possible buffer overflow.
 2005-04-15 19:26:38 +02:00
ingo@mysql.com
990ebef7f6 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
mskold@mysql.com
add3fd3cca Merge 2005-04-13 16:24:17 +02:00
serg@serg.mylan
0294339b9c don't check record's checksum in REPAIR 2005-04-11 20:04:50 +02:00
ingo@mysql.com
3add511de7 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.
 2005-04-08 14:13:02 +02:00
bar@eagle.intranet.mysql.r18.ru
2a1ad57732 Merge 2005-03-25 10:43:35 +04:00
bar@mysql.com
15378f833f myisamchk.c: 
Wrong help string fix.
 2005-03-24 18:21:56 +04:00
dlenev@mysql.com
ea8adbff36 Manual merge of csets from -build tree into main 5.0 tree. 2005-03-21 11:39:47 +03:00
jimw@mysql.com
ee2b4ec959 Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826)
 2005-03-18 16:12:25 -08:00
brian@zim.(none)
473e1ffd3a Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup). 2005-03-16 16:22:56 -08:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
serg@serg.mylan
0279cd50d9 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
svoj@mysql.com
4bfa65391a Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/ft-mysql-5.0
 2005-03-07 14:00:22 +04:00
svoj@mysql.com
2aa80e0be8 BUG#8351 post-review improvements. 2005-03-07 00:17:57 +04:00
serg@serg.mylan
2b447eceb1 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
svoj@mysql.com
efa1092c2e Fix for BUG#8351 (5.0) - Double quote in Boolean Fulltext query causes crash 2005-03-04 16:10:41 +04:00
ingo@mysql.com
212388bd3c Merge with after merge fix 2005-03-04 11:37:45 +01:00
ingo@mysql.com
b5775ee16c Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-03-04 09:35:21 +01:00
ingo@mysql.com
d68db573e6 Fix for a build bug. 
Added a missing comma.
 2005-03-04 09:30:22 +01:00
serg@serg.mylan
e47d0a0e2d merge 2005-03-03 23:07:20 +01:00
serg@serg.mylan
8d9a53a78c Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it) 2005-03-03 19:51:29 +01:00
ingo@mysql.com
306bd2fc69 Merge 2005-03-02 10:56:13 +01:00
ingo@mysql.com
d3d7c46b1c 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.
 2005-03-02 10:35:00 +01:00
monty@mysql.com
7e5f74f8f2 Merge with global tree 2005-02-25 17:12:06 +02:00
monty@mysql.com
0a6b7aedb2 Remove compiler warnings and remove not used variables 
(Found during build process)
 2005-02-25 16:53:22 +02:00
reggie@mdk10.(none)
579293a29f More changes to make 5.0.3 compile on Windows 
sql_map.cc:
  moved include of sys/stat outside of HAVE_SYS_MMAN_H define
my_decimal.h:
  Added define for EMBEDDED_SERVER for call to string2my_decimal
mi_packrec.c:
  removed cast to caddr_t
 2005-02-23 22:55:46 -06:00
reggie@mdk10.(none)
2ffd3a3a61 Changes to allow 5.0.3 to compile on Windows after XA was pushed 
logging_ok:
  Logging to logging@openlogging.org accepted
mi_packrec.c:
  Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
mi_extra.c:
  Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
my_mmap.c:
  Changed how no mmap message is printed for Windows
sql_map.cc:
  Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap
 2005-02-23 16:29:03 -06:00
bar@mysql.com
a88af6c1dd Merge 2005-02-23 17:03:34 +04:00
bar@mysql.com
5ef265f219 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.
 2005-02-22 16:37:25 +04:00
bar@mysql.com
47b85939a5 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
hf@deer.(none)
68a1ba2562 Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-02-18 15:57:39 +04:00
hf@deer.(none)
8b2fc991cd 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
hf@deer.(none)
93e0107050 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
 2005-02-18 15:51:55 +04:00
dean@mysql.com
2f7595ea84 Merge mysql.com:/home/dellis/bkl/bug-4.1 
into mysql.com:/home/dellis/bkl/bug-5.0
 2005-02-16 17:35:00 -06:00
dean@mysql.com
ace1d892f0 Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0 
into mysql.com:/home/dellis/bkl/bug-4.1
 2005-02-15 17:30:40 -06:00
dean@mysql.com
c962d060ac ft_nlq_search.c: 
Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)
 2005-02-15 17:27:23 -06:00
monty@mysql.com
38d1a42481 Merge with 4.1 2005-02-15 17:12:13 +02:00
svoj@mysql.com
643b602832 Bug#8351 
Fix for crash when using a double quote in boolean fulltext query.
 2005-02-14 18:54:12 +04:00
serg@serg.mylan
42bb0901a3 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
serg@serg.mylan
d355174522 make LOAD INDEX to work 2005-02-12 00:05:13 +01:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
jimw@mysql.com
8c8553af81 Merge changes 2005-02-04 11:59:02 -08:00
serg@serg.mylan
cc1ee6475f indexless boolean fulltext search was depending on default_charset_info - Bug#8159 
ftbw->off wasn't cleared on reinit - Bug#8234
 2005-02-04 15:24:06 +01:00
serg@serg.mylan
c76405a7ee merged 2005-01-24 19:41:42 +01:00
serg@serg.mylan
67ba2e367a fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
serg@serg.mylan
b53757ba91 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
serg@serg.mylan
b4624288a7 myisam/ft_boolean_search.c 
-trunc* bug - don't increase yweaks in this case
 2005-01-18 11:27:38 +01:00
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02:00
monty@mysql.com
e5b788146a Fixed new bug that caused symlink test to fail 2005-01-18 03:49:39 +02:00
guilhem@mysql.com
05793bb9b9 Merge 2005-01-16 21:39:21 +01:00
serg@serg.mylan
ef58da5435 don't ignore errors in readlink 2005-01-15 20:08:53 +01:00
jani@ua141d10.elisa.omakaista.fi
f3e73e26d7 A patch for Netware. 2005-01-13 19:24:54 +02:00
monty@mysql.com
314cf993c6 Fixed memory reference errors found by valgrind 2005-01-12 03:38:53 +02:00
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
hf@deer.(none)
27eff9f700 Fix for bug #7545 (Undefined symbols if --without-geometry) 2005-01-03 17:33:04 +04:00
monty@mysql.com
5e03ebbcad After merge fixes 
Cleanup of mi_print_error() handling
Deleted 'merge' directory
 2004-12-31 03:47:56 +02:00
monty@mysql.com
34d5331cee Merge with global tree 2004-12-31 00:50:30 +02:00
monty@mysql.com
d71c030587 After merge fixes 2004-12-31 00:44:00 +02:00
ingo@mysql.com
c39be2d0e7 WL#1895 - Print message to error log in case of detected MyISAM corruption 
Changed my_error() to print error messages, which come from
arbitrary registered ranges of error messages. Messages can
be unregistered (and should be at end of the program).
Added registration of handler error messages.
Added a new mi_print_error() macro and a new 
mi_report_error() function, which supply error
messages with a table name.
Added calls to mi_print_error() or mi_report_error()
at all places in MyISAM, where table corruption is detected.
 2004-12-23 20:11:38 +01:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
sergefp@mysql.com
1e102d1aaf 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
monty@mysql.com
6477b4dfd2 Merge with global tree 
Fixed some found bugs in BIT fields
Added more test cases for BIT fields and varchar
 2004-12-19 20:25:19 +02:00
monty@mysql.com
f37fd31ddc Merge with global tree 2004-12-18 06:05:16 +02:00
monty@mysql.com
3fb088a075 Add 0x before pointers (to help with debugging) 
Add support for VARCHAR with 1 or 2 length bytes
Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly)
Give error if we got problems in temporary tables during a SELECT
Don't use new table generated by ALTER TABLE if index generation fails
Fixed wrong call by range_end() (Could cause an ASSERT in debug mode)
 2004-12-18 05:19:21 +02:00
ram@gw.mysql.r18.ru
92f89369ae bit type 2004-12-17 18:06:05 +04:00
konstantin@mysql.com
2083ecd124 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.
 2004-12-16 02:43:35 +03:00
hf@deer.(none)
192715dbbb Fix for bug #6516 (Server crash loading spatial data) 
(after discussion with SerG)
 2004-12-10 16:06:49 +04:00
serg@serg.mylan
36cee4b4d9 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
serg@serg.mylan
36e80455f5 allocate a buffer large enough for a longer matching string 2004-12-07 21:41:29 +01:00
monty@mysql.com
563500994a Update results for new varchar handling 
Fixed compiler warnings
String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
 2004-12-07 15:47:00 +02:00
monty@mysql.com
77207d19f2 Merge with new VARCHAR code 2004-12-06 19:18:35 +02:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
hf@deer.(none)
e211b26330 Fix for bug #6755 (ALTER TABLE ENABLE KEYS corrupts spatial index) 2004-12-06 11:42:41 +04:00
monty@mysql.com
67ce247965 Add support for up to VARCHAR (size up to 65535) 
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
 2004-12-06 02:00:37 +02:00
serg@serg.mylan
da92505db7 myisam/mi_packrec.c 
more robust checks (catch more corruptions)
 2004-12-02 15:14:36 +01:00
serg@serg.mylan
dd7ff9335a one more test for corrupted compressed MyISAM table 2004-12-01 22:46:39 +01:00
sergefp@mysql.com
0bf584d9a5 Fix and testcase for BUG#6699 2004-11-29 06:51:30 +03:00
tomas@poseidon.ndb.mysql.com
538a3f7a53 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2004-11-25 13:33:31 +00:00
serg@serg.mylan
e8203e437a 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
serg@serg.mylan
cd463b5202 harmless "buffer overflow" fixed 2004-11-24 11:01:54 +01:00
serg@serg.mylan
508067420e Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-11-23 15:50:29 +01:00
serg@serg.mylan
48e7c9abc6 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
serg@serg.mylan
ee933cd198 merged 2004-11-22 21:33:15 +01:00
serg@serg.mylan
2ca5a0f2b1 merged 2004-11-22 20:15:48 +01:00
serg@serg.mylan
b7aa981578 "Table file %s was created in MySQL 4.1+" is an error, not a warning 2004-11-22 19:18:35 +01:00
serg@serg.mylan
dca2182fdc ft_boolean_search.c: 
bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
  bug#6705
 2004-11-22 18:37:30 +01:00
serg@serg.mylan
e68bd85b77 merged 2004-11-17 18:04:36 +01:00
serg@serg.mylan
37e872de8c merged 2004-11-17 15:28:37 +01:00
serg@serg.mylan
3d67df4cff wrong constant fixed - boolean fulltext searches like "+something +smth*" 
were stopping at docid 0xffffffff
 2004-11-12 22:55:00 +01:00
monty@mysql.com
addd1a0da8 Merge with 4.1 2004-11-12 19:58:24 +02:00
monty@mysql.com
e9c3887b58 After merge fixes 2004-11-12 17:44:17 +02:00
brian@avenger.(none)
1d8a6a06a5 Merge avenger.(none):/export/brian/mysql/test/4.1 
into avenger.(none):/export/brian/mysql/test/5.0
 2004-11-11 22:12:01 -08:00
serg@serg.mylan
0be3c55594 mi_write: fix for ft2 when found word (in the tree) has different length as the word to insert 2004-11-11 21:26:24 +01:00
monty@mysql.com
071001950e Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
ram@gw.mysql.r18.ru
e1979f2580 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).
 2004-11-02 13:14:07 +04:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
serg@serg.mylan
d2bfefc3c1 proper max_records estimation for sort-repair of fulltext indexes 2004-10-29 14:24:06 +02:00
lenz@mysql.com
6b720d93be - Applied some Windows portability fixes for myisampack.c and sql_handler.cc 
(backports from fixes made in 4.1)
 2004-10-27 21:51:27 +02:00
serg@serg.mylan
fb232f7e54 don't hang if the text contains illegal characters 2004-10-25 10:23:38 +02:00
serg@serg.mylan
66124a5ec1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-10-22 22:44:08 +02:00
serg@serg.mylan
9336d010af correct fix for the bug #6151 2004-10-22 22:42:11 +02:00
lenz@mysql.com
0c3fb81a70 - applied portability fix for Windows (1ULL -> ULL(1)) to myisampack.c 2004-10-22 22:26:57 +02:00
serg@serg.mylan
1e60c59102 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-10-22 20:34:25 +02:00
serg@serg.mylan
5d524d9e8e Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-10-22 18:21:56 +02:00
monty@mysql.com
3afecef4df Fix compiler warnings (detected by Intel's C++ compiler) 
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
 2004-10-22 18:44:51 +03:00
serg@serg.mylan
0ad752e8af s/puts/printf/ 2004-10-21 15:34:26 +02:00
monty@mysql.com
e1218474b8 Merge with 4.0 2004-10-20 16:24:28 +03:00
monty@mysql.com
1f8b3d0f22 Code cleanups (done during review of new code) 
Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
 2004-10-20 11:24:08 +03:00
monty@mishka.local
04c23808a8 Review of all code pushed since last review 
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
 2004-10-20 01:28:42 +03:00
sergefp@mysql.com
d86b33c641 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/mnt/tmp/mysql-4.0-bug-myisampack
 2004-10-11 21:30:25 +04:00
monty@mysql.com
1dd4bd5f6c Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-10-07 12:51:32 +03:00
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release 
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
 2004-10-06 19:14:33 +03:00
monty@mysql.com
97febc4dc4 Code cleanups while doing review of pushed code 2004-10-06 17:20:39 +03:00
monty@mysql.com
c27d22b44e Reverted patch for new usage of open_count as it caused more problems than it solved 
Cleaned up patch for checking locks for multi-table updates
 2004-10-06 01:24:21 +03:00
sergefp@mysql.com
f7b6a99d50 Fix for BUG#4785 part two: 
* If at least one of indexes is disabled, use data file size as an estimate 
  for key file size.
* Added handling for joined tables.
 2004-09-29 23:25:32 +04:00
sergefp@mysql.com
df267c6c0a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/mnt/tmp/mysql-4.0-bug-myisampack
 2004-09-22 16:42:06 +04:00
sergefp@mysql.com
6e0ba8e615 Fix for BUG#4785: 
* myisampack leaves key_file_length value from original table
 * myisamchk uses this value when calculating key file pointer length
 2004-09-22 16:29:15 +04:00
ingo@mysql.com
7afb03b7ed bug#2831 - --extenral-locking does not fully work with --myisam-recover. 
Changed the semantics of open_count so that it is decremented
at every unlock (if it was incremented due to data changes).
So it indicates a crash, if it is non-zero after a lock.
The table will then be repaired.
 2004-09-18 20:33:39 +02:00
hf@deer.(none)
02595629c2 Fix for bug #5532 (error 22 inserting GIS data) 
This bug is the result of weird error happening with mi_float8get and double
arythmetic. I described that in 'Bug that looks potentially dangerous' email
 2004-09-15 19:46:42 +05:00
monty@mysql.com
31122efde7 Merge with 4.1 
(Includes merge of arena code in 4.1 and 5.0)
 2004-09-06 15:14:10 +03:00
serg@serg.mylan
9153fd2ae4 merged 2004-09-03 22:12:27 +02:00
serg@serg.mylan
9b0468bc96 BUG#5327 - mi_sort_index() of 2-level tree 2004-09-03 22:04:08 +02:00
monty@mysql.com
054cea4ca8 Merge with 4.0 2004-09-01 04:12:09 +03:00
ram@gw.mysql.r18.ru
b93a973b12 Added global my_getopt_error_reporter function pointer which is 
used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
 2004-08-31 21:27:58 +05:00
serg@serg.mylan
994d648dda space-stripping in _mi_prefix_search: BUG#5284 2004-08-30 16:12:53 +02:00
serg@serg.mylan
b60713c033 bug in my_strnncoll_utf8 (and friends) fixed 
cleanups
better, charset-dependent, ft_max_len_for_sort value
 2004-08-30 08:37:36 +02:00
serg@serg.mylan
acbf96a161 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-26 17:49:16 +02:00
monty@mysql.com
ea687ba5da Portability fixes 
Fixed bug in end space handle for WHERE text_column="constant"
 2004-08-26 18:26:38 +03:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
serg@serg.mylan
50ee43be43 BDB: Bug#4531: unique key prefix interacts poorly with utf8, 
Bug#4594 column index make = failed for gbk
 2004-08-24 15:32:57 +02:00
serg@serg.mylan
949348f576 after merge fix 2004-08-20 22:54:42 +02:00
bar@mysql.com
7a27f2ce8c Bug#4594 "column index make = failed for gbk, but like works" 
Fix for MyISAM. Tests for MyISAM and HASH+BTREE.
 2004-08-20 21:29:36 +05:00
bar@mysql.com
2496e85b84 Bug#4521: unique key prefix interacts poorly with utf8. 
Fix for binary collations for MyISAM and HEAP BTREE.
This patch also changes trailing spaces behaviour for
binary collations. Binary collations now have PAD 
characteristic too.
 2004-08-19 15:15:10 +05:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
rburnett@build.mysql.com
67003d1c98 mysql_priv.h: 
Added declarations for print_msg_to_log and vprint_msg_to_log.  sql_print_error are simple functions that wrap calls to print_msg_to_log.  Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
log.cc:
  Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log.  Print_msg_to_log will write the message to the windows event log if on NT.  We now have error, warning, and information versions of sql_print_xxxx.  T his is a variation of a similar changeset WAX did.
mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
Many files:
  Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
  Added second function pointer to server as an error reporting callback.  Added local function report_option_error that will either write the error to stderr or to the error reporting callback.  changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
  Changed declaration of handle_options to use typedefs for the two function pointers.  added second function pointer to server as an error reporting callback
mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)
 2004-08-14 03:38:37 +02:00
serg@serg.mylan
cd7276689e apply UNIQUE constrain correctly for multi-byte charsets 
only MyISAM is fixed
 2004-08-13 18:29:25 +02:00
bar@mysql.com
fad7a5643a #4521: unique key prefix interacts poorly with utf8 
Fix for MyISAM with prefix compressed keys.
 2004-08-12 20:39:24 +05:00
serg@serg.mylan
56b423e058 bad merge fixed - myisamchk support for --ft_stopword_file restored 2004-08-10 10:07:59 +02:00
serg@serg.mylan
f4244cd00e bug#4816. index search for NULL in blob 2004-08-01 13:26:01 +02:00
ingo@mysql.com
4b42225c55 Fixed some DBUG_PRINT format problems. 2004-07-26 15:32:52 +02:00
ingo@mysql.com
d2c8d8d609 Fixed a probable typo. Unfortunately we will not be able to test this ;-) 2004-07-26 13:58:08 +02:00
konstantin@mysql.com
569d3c8488 WL#1518, "make bundled zlib usable for unix builds": 
required autotools macro written and deployed in all apropriate Makefile.ams.
Use cases checked:
- linux, standard location of zlib, no ndb
- linux, standard locatoin of zlib, with ndb
- linux, non-standard location of zlib, no ndb
- hpux11, use of bundled zlib, no ndb 
The only non-checked case is non-standard location of zlib (or use of bundled
zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts 
like AIX52 or HPUX11, where such a check is possible. It didn't compile 
there before as these systems dont't have installed zlib, so nothing got broken ;)
 2004-07-24 03:30:11 -07:00
serg@serg.mylan
2fd11169ab failing fulltext_order_by.test fixed 2004-07-15 17:30:55 +02:00
monty@mysql.com
5b3c418b48 After merge fixes 
Note: The following tests fails
- fulltext (Sergei has promised to fix)
- rpl_charset (Guilhem should fix)
- rpl_timezone (Dimitray has promised to fix)

Sanja needs to check out the calling of close_thread_tables() in sp_head.cc
 2004-07-15 04:19:07 +03:00
monty@mysql.com
fa7f63d46d After merge fixes 2004-07-12 07:43:38 +03:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
serg@serg.mylan
2b93adb9c1 Bug#3808 - fulltext index, delete, 2-level tree, the word on the 1st level has different length than the key (latin1_german2_ci) 2004-06-25 13:11:02 +02:00
serg@serg.mylan
c03addab79 merged 2004-06-23 12:36:07 +02:00
serg@serg.mylan
3f1c4ba745 handler interface cleanups: 
more logical table/index_flags
  return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
  max_keys and other limits renamed to max_supported_keys/etc
  max_keys/etc are now wrappers to max_supported_keys/etc 
  ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing
 2004-06-23 12:29:05 +02:00
monty@mysql.com
1388c164bc After merge fixes 
Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
 2004-06-21 10:21:20 +03:00
monty@mysql.com
fd0153304d Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173) 
Fixed problem with NULL and derived tables (Bug #4097)
Cleanup of new pushed code
 2004-06-18 03:02:29 +03:00
serg@serg.mylan
516bcf508c after merge fix 2004-06-11 21:20:53 +02:00
serg@serg.mylan
035e03c1f6 merged 2004-06-11 20:55:08 +02:00
konstantin@mysql.com
f08bbd1f12 assert.h needed for my_dbug.h now is included in my_dbug.h, where it for 
some reason wasn't included before.
A lot of files cleaned up from #include <assert.h>
 2004-06-10 23:58:39 +04:00
serg@serg.mylan
78fa465b92 bug#3964 and related issues: FTB problems with charsets where one byte can match many 
correct prefix compare with my_strnncoll
 2004-06-10 21:18:57 +02:00
konstantin@mysql.com
e64b38e8bc Fix for Bug#3904 "COUNT DISTINCT performance anomaly in 4.1" 
The bug was caused by error in hash calculation function: it
always returned hash value for last field in a composite key, so 
for keys like (a text, b char(1)) we were always
getting bad hash values.
 2004-06-10 01:30:39 +04:00
serg@serg.mylan
a3e684da44 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-06-04 21:16:55 +02:00
serg@serg.mylan
9a9bde89ce make CHECK killable 2004-06-04 21:15:08 +02:00
paul@kite-hub.kitebird.com
2f0ca1ce42 Fix skipp -> skip once and for all. 
(Note: This affects only comments, not variable names.)
 2004-06-03 11:52:54 -05:00
monty@mysql.com
5ddf741a8d portability fix 2004-06-03 02:13:19 +03:00
hf@deer.(none)
b8cf9f6afe Merging 2004-06-02 19:17:35 +05:00
hf@deer.(none)
7cf1d2596b wl 1562 (To improve RTree indexes) 
some changes to make code nicer
 2004-06-02 19:11:57 +05:00
hf@deer.(none)
39f69a2126 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.ftr
 2004-06-01 22:37:39 +05:00
monty@mysql.com
b32fd18630 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-28 00:06:19 +03:00
monty@mysql.com
e9b7e3baa8 merge with 4.0 to get fix to VC++ project files 2004-05-27 23:45:22 +03:00
serg@serg.mylan
1998dd786e backport bug#2708 fix from 4.1 2004-05-27 21:14:59 +02:00
hf@deer.(none)
15ea09b79d WL#1163 (Make spatial code separable for other parts) 
--with-geometry and
--with-embedded-privilege-control
configure switches added
 2004-05-27 20:31:30 +05:00
dlenev@brandersnatch.localdomain
03b705ff44 Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should 
produce hex digits in lower case). (fixed version)

Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.
 2004-05-27 17:54:40 +04:00
hf@deer.(none)
e27322d826 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.spa
 2004-05-27 17:27:42 +05:00
hf@deer.(none)
374a28d293 Merging 2004-05-27 16:32:49 +05:00
monty@mysql.com
3ad2158b42 Portability fixes 2004-05-27 12:03:16 +03:00
monty@mysql.com
7d8f8bc77b Changed prototype of killed_ptr() to make it more portable 
Applied patches for Netware
 2004-05-26 19:12:49 +03:00
pem@mysql.com
71eddc362e Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
monty@mysql.com
390d9898f9 merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
monty@mysql.com
ca8dbc24ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/tmp/skr99/mysql-4.0
 2004-05-25 22:01:50 +03:00
monty@mysql.com
f2e1e3ce4c Added patches from Novell 2004-05-25 22:00:14 +03:00
hf@deer.(none)
f200b0fbf0 WL#1562 (Improving spatial code) 
A set of changes improving our RTree indexes and fixed few bugs
found during the tests
 2004-05-25 15:06:32 +05:00
konstantin@mysql.com
f207b33a7b Support for character set conversion in binary protocol: another go 
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
  connection on the fly, because they first should be written to the binary
  log.
  To support efficient conversion we need to rewrite prepared statements
  binlogging code first.
 2004-05-25 02:03:49 +04:00
serg@serg.mylan
41f4f0317f bug in repair_by_sort of fulltext indexes that contained identical 
(as of mi_compare_text) words with different lengths.
bug #3835
 2004-05-23 14:01:52 +02:00
monty@mysql.com
86a966256b Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
 2004-05-19 16:38:12 +03:00
monty@mysql.com
21f1bca789 Portability fixes 
Fixed wrong number of warnings/duplicates for machines with high-byte-first
 2004-05-19 05:09:10 +03:00
monty@mysql.com
cd3dab49cc Merge with 4.0.20 2004-05-17 01:52:13 +03:00
monty@mishka.local
314a8bf114 key_cmp -> key_cmp_if_same 
New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys
 2004-05-16 14:48:32 +03:00
serg@serg.mylan
c50e85bd7c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-05-10 12:39:31 +02:00
serg@serg.mylan
2cbc4e71fc backport from 4.1: 
"phrase search" should not match partial words (it should not match 'paraphrase searches')
 2004-05-10 12:39:01 +02:00
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
ingo@mysql.com
5c4f83bbd9 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-wl1687
 2004-05-07 11:13:58 +02:00