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
