hf@deer.(none)
418a7bfcde
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-08-27 18:10:46 +05:00
hf@deer.(none)
5b35789d12
Merge deer.(none):/home/hf/work/mysql-4.1.9645
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-08-27 18:06:09 +05:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-08-26 15:56:52 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0
Several fixes for Netware.
2005-08-24 22:03:34 +03:00
hf@deer.(none)
45b07fd422
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.9645
2005-08-22 13:08:44 +05:00
jimw@mysql.com
a3eaf4eec2
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-15 12:37:45 -07:00
jimw@mysql.com
f693d22bb1
Make sure to clean up temporary files in myisampack even when the
...
-T option is used. (Bug #12235 )
2005-08-12 11:44:25 -07:00
acurtis@xiphis.org
b9476f7d50
Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
...
into xiphis.org:/usr/home/antony/work2/merge-5.0
2005-08-11 12:18:53 +01:00
hf@deer.(none)
13a23f70b9
Fix for bug #9465 (check table extended fails with SPATIAL)
2005-08-09 21:30:28 +05:00
monty@mysql.com
30a51b5323
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-08-08 13:14:29 +03:00
igor@rurik.mysql.com
b5f33d2bc4
Manual merge
2005-08-02 12:09:49 -07:00
svoj@mysql.com
a4d6113d22
After merge fix.
2005-08-02 12:57:26 +05:00
svoj@mysql.com
0f98bf44ef
Merge mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.0
...
into mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.1
2005-08-02 12:12:37 +05:00
svoj@mysql.com
19fe33e16c
BUG#11684 fix.
...
Repair crashes mysql when table has fulltext index.
2005-08-02 11:33:26 +05:00
monty@mysql.com
987edeaa9b
Fixed compiler warnings
2005-07-28 21:25:05 +03:00
hf@deer.(none)
f2944dca2a
Merging
2005-07-27 12:49:44 +05:00
hf@deer.(none)
ce3269c667
Fix for bug #10893 (myisamchk fails on packed spatial)
...
need to be fixed in 4.1
2005-07-23 20:04:15 +05:00
hf@deer.(none)
1d11e8891e
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.10839
2005-07-21 15:47:57 +05:00
jani@a193-229-222-105.elisa-laajakaista.fi
0f7639ba15
Added some missing casts and changed a define for alloca().
2005-07-20 13:27:57 +03:00
hf@deer.(none)
38d562ccc1
Fix for bug #10839 (myisamchk -rq crashes on spatial field)
2005-07-20 14:51:42 +05:00
ingo@mysql.com
ec15dda2bf
Bug#10932 - Building server with key limit of 128, makes test cases fail
...
This patch allows to configure MyISAM for 128 indexes per table.
The main problem is the key_map, wich is implemented as an ulonglong.
To get rid of the limit and keep the efficient and flexible
implementation, the highest bit is now used for all upper keys.
This means that the lower keys can be disabled and enabled
individually as usual and the high keys can only be disabled and
enabled as a block. That way the existing test suite is still
applicable, while more keys work, though slightly less efficient.
To really get more than 64 keys, some defines need to be changed.
Another patch will address this.
2005-07-19 14:13:56 +02:00
kent@mysql.com
8e3b393d5c
Merge
2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a
Makefile.am:
...
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
monty@mysql.com
fe30ec9032
manual merge
2005-07-04 03:50:04 +03:00
monty@mysql.com
ec420bfb43
Fixes during review of new code
...
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
2005-07-04 03:42:33 +03:00
monty@mysql.com
86d7b02199
Merge with 4.1
2005-07-03 14:17:52 +03:00
jani@ua141d10.elisa.omakaista.fi
15d4217c58
Don't allow 8bytes for data file pointers for now.
2005-06-30 17:55:47 +03:00
jani@ua141d10.elisa.omakaista.fi
b60175f9c4
Fixed Bug#11226 and reverted fix for Bug#6993.
...
Using 8 bytes for data pointer does not work at least on
all computers. The result may become 0 or negative number.
(mysqld, myisamchk)
2005-06-30 16:13:22 +03:00
ingo@mysql.com
e81358565b
Bug#8321 - myisampack bug in compression algorithm
...
Added 64-bit extensions, comments, extended statistics
and trace prints.
2005-06-24 19:34:55 +02:00
monty@mishka.local
1524cd001d
Cleanup during review of new code
...
Fixed wrong allocation that could cause buffer overrun when using join cache
2005-06-21 18:18:58 +03:00
jimw@mysql.com
99e35c84ac
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-20 15:02:45 -07:00
jimw@mysql.com
176143413e
Fix hang/crash with Boolean full-text search against an unindexed field for
...
which the query contained more words than we allocated space. (Bug #7858 )
2005-06-17 21:44:17 +02:00
reggie@mdk10.(none)
6a9ce670ea
Merge mdk10.(none):/home/reggie/bk/mysql-4.1-base
...
into mdk10.(none):/home/reggie/bk/mysql-5.0-base
2005-06-10 16:45:54 -05:00
acurtis@xiphis.org
3b8c3bd7e1
Merge
2005-06-09 17:15:06 +01:00
reggie@mdk10.(none)
68c6470acf
Bug #8183 MERGE and SYM cause wrong SHOW CREATE TABLE
...
Without this patch, all file elements in info have symlink resolved
pathnames. This means append_create_info does not have any way
of showing the correct database name when a symlinked database is used.
2005-06-09 09:00:51 -05:00
igor@rurik.mysql.com
c9c52df80b
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 08:23:46 -07:00
igor@rurik.mysql.com
c963b12fd3
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 06:38:05 -07:00
monty@mysql.com
543691ab15
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
2005-06-07 16:34:10 +03:00
monty@mysql.com
1c725ff797
Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites
...
Fix instead wrong call to ha_key_cmp
This is related to bug #10741 Inserting double value into utf8 column crashes server
2005-06-07 15:09:49 +03:00
bar@mysql.com
093573b6b7
Bug#10253: compound index length and utf8 char set
...
produces invalid query results
mi_key.c:
well_formed_length should be executed before space trimming, not after.
ctype_utf8.test:
ctype_utf8.result:
adding test.
2005-06-07 13:56:42 +05:00
reggie@monster.
4283fdb170
fixes for compiler warnings from VC6
2005-06-06 11:34:52 -05:00
bar@mysql.com
2df945d87b
Bug#8610: The ucs2_turkish_ci collation fails with upper('i')
...
UPPER/LOWER now can return a string with different length.
mi_test1.c:
Adding new arguments.
Many files:
Changeing caseup/casedn to return a result with different
length than argument.
sql_string.h:
Removing unused method,
mysql_priv.h:
Removing unused method
2005-06-06 16:54:15 +05:00
mronstrom@mysql.com
1eaacaf194
Bug #10901
...
After review fix
Copy from internal state to share state only when in lock write
mode (happens only when lock table x write has been performed since
update_state_info is only called when holding a TL_READ_NO_INSERT
lock normally. Previous patch would have failed in combination with
delayed writes.
2005-06-03 22:52:24 +02:00
mronstrom@mysql.com
96252c1de9
Bug #10901
...
Analyze table corrupts the state on
data_file_length, records, index_file_length...
by writing the shared state when there is an updated internal
state due to inserts or deletes
Fixed by synching the shared state with the internal state before
writing it to disk
Added test cases of 2 error cases and a normal case in new
analyze test case
2005-06-03 17:13:43 +02:00
reggie@mdk10.(none)
21133df02a
fixed conflicts
2005-05-20 16:34:59 -05:00
ramil@mysql.com
bb9dc47d3d
a fix (bug #10757 : gis-rtree.test fails)
2005-05-20 18:48:18 +05:00
monty@mysql.com
0b75f6e37b
compatibility issues
...
Fixed errors reported by valgrind (some errors in NDB remains)
2005-05-20 16:14:35 +03:00
jimw@mysql.com
3f6aad900c
Resolve merge from 4.1
2005-05-18 11:06:34 -07:00
sergefp@mysql.com
cc13545413
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10095
2005-05-16 22:21:19 +02:00