kent@mysql.com
99435aa746
NdbIndexStat.cpp, NdbIndexStat.hpp, Suma.hpp portability changes from pekka
2005-11-06 14:12:14 +01:00
ramil@ndbmaster.mysql.com
bd18c9f24d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into ndbmaster.mysql.com:/home/ndbdev/tomas/mysql-5.1-new
2005-11-06 08:30:26 +01:00
ramil@ndbmaster.mysql.com
7678149864
WL #528 : Faster free_tmp_table
2005-11-06 08:29:03 +01:00
kent@mysql.com
37788da790
Reapplied portability changes, from changesets by kent, joerg and msvensson
2005-11-06 02:19:51 +01:00
ramil@poseidon.ndb.mysql.com
9b532768f5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2005-11-06 01:38:51 +01:00
ramil@poseidon.ndb.mysql.com
63a497a103
1. sys_variables[] array is removed.
...
2. All have_xxx variables are now selectable.
2005-11-06 01:36:40 +01:00
reggie@ndbmaster.mysql.com
c1038ded6a
myisammrg.vcproj, myisam.vcproj, innobase.vcproj, heap.vcproj, bdb.vcproj:
...
updated include directory after move to storage directory
mysql.sln:
updated locations of storage engines
myisam.vcproj:
Rename: VC++Files/myisam/myisam.vcproj -> VC++Files/storage/myisam/myisam.vcproj
heap.vcproj:
Rename: VC++Files/heap/heap.vcproj -> VC++Files/storage/heap/heap.vcproj
innobase.vcproj:
Rename: VC++Files/innobase/innobase.vcproj -> VC++Files/storage/innobase/innobase.vcproj
myisammrg.vcproj:
Rename: VC++Files/myisammrg/myisammrg.vcproj -> VC++Files/storage/myisammrg/myisammrg.vcproj
bdb.vcproj:
Rename: VC++Files/bdb/bdb.vcproj -> VC++Files/storage/bdb/bdb.vcproj
2005-11-06 00:20:38 +01:00
tomas@poseidon.ndb.mysql.com[tomas]
41271735f4
Ndb handler cleanup:
...
- removed some returns on ndb internal error codes, return ndb cause in warnings
- moved all errorcode mapping mysqld-ndb to ndberror.c
- ndb util thread to discover all ndb tables at startup
- ndb util thread to wait for mysqld startup
2005-11-06 00:20:37 +01:00
tomas@poseidon.ndb.mysql.com[tomas]
4caff6ebf9
ndb -
...
update test result for conflicting error codes
2005-11-05 22:57:09 +01:00
tomas@poseidon.ndb.mysql.com[tomas]
7591d4dc5b
ndb - fix conflicting error codes
2005-11-05 22:55:51 +01:00
tomas@poseidon.ndb.mysql.com[tomas]
c69b482102
ndb - test_event
...
Fix problem when creating shadow table
2005-11-05 22:54:25 +01:00
tomas@poseidon.ndb.mysql.com[tomas]
fc90ffc038
ndb - bug with index build of unique index with 32 attributes
...
since NDB$FRAGMENT is automatically added, there was a over run in the struct
2005-11-05 22:50:15 +01:00
monty@mysql.com
77cc408ce8
Fixed results in test result
2005-11-05 15:14:04 +02:00
monty@mysql.com
d9a687758c
Added inclusion of dlfcn.h from old 5.1 tree
2005-11-05 14:10:48 +02:00
monty@mysql.com
cdf64f0f57
Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree)
...
This is a merge of 5.0 -> 5.1 + some code from old 5.1 tree to get all tests to work and keep the .frm format the same as the old 5.1 tree.
2005-11-05 13:20:35 +02:00
monty@mysql.com
a6f5375cb0
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
monty@mysql.com
303f6b4a7a
Reorder struct elements to be more optimal for 64 bit computers
...
(Main reason for reordering was to get rid of compiler warnings for order of element initialization)
2005-11-04 15:12:22 +02:00
monty@mysql.com
b90fa0185b
Merge monty@192.168.0.9:/my/mysql-5.0
...
into mysql.com:/my/mysql-5.0
2005-11-04 10:03:32 +02:00
monty@mysql.com
2d39028ef2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-11-04 10:03:31 +02:00
monty@mysql.com
89fdc4f49e
DROP created procedures
...
(Caused sp-security to fail)
2005-11-04 10:02:43 +02:00
jimw@mysql.com
5764170898
Merge mysql.com:/home/jimw/my/mysql-5.0-9815
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-03 17:24:24 -08:00
monty@mysql.com
18a87b9546
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/my/mysql-5.0
2005-11-03 22:42:26 +02:00
monty@mysql.com
90ca9150a4
Fixes during review of new code
...
Destroy LOCK_uuid_generator
2005-11-03 22:42:25 +02:00
jani@hasky.mysql.fi
c01c714161
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hasky.mysql.fi:/home/jani/mysql-5.0
2005-11-03 21:17:23 +02:00
jani@ua141d10.elisa.omakaista.fi
fcea95c2e5
Disabled ps_protocol for two statements.
2005-11-03 20:29:21 +02:00
rburnet@fedora.(none)
f8f35a7b00
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into fedora.(none):/home/reggie/bk/mysql-5.0-new
2005-11-03 11:01:28 -06:00
jani@ua141d10.elisa.omakaista.fi
c4aa14fad7
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-11-03 19:01:28 +02:00
holyfoot@deer.(none)
a6ada95d1e
test enabled
2005-11-03 21:01:27 +04:00
holyfoot@mysql.com
1d8243c8ed
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 20:58:43 +04:00
holyfoot@mysql.com
a8b38c1d5a
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 19:47:08 +04:00
jani@ua141d10.elisa.omakaista.fi
00aa48c75d
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-11-03 17:44:57 +02:00
jani@ua141d10.elisa.omakaista.fi
2940a338c5
Disabled a test temporarily.
2005-11-03 17:39:40 +02:00
jani@ua141d10.elisa.omakaista.fi
0f83ba137a
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-11-03 16:43:05 +02:00
jani@ua141d10.elisa.omakaista.fi
6c8bda306d
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 16:43:04 +02:00
evgen@moonbone.local
e92452c8ed
opt_range.cc:
...
Additional fix for bug#14093
2005-11-03 17:43:03 +03:00
jani@ua141d10.elisa.omakaista.fi
0ee589b4d6
Changes in get_table_type() and mysql_frm_type(). The main problem was
...
that in mysql_rm_table_part2_with_lock() previously we needed to open
same file twice. Now once is enough.
2005-11-03 16:10:11 +02:00
jani@ua141d10.elisa.omakaista.fi
cbf8a00c0b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 15:39:55 +02:00
jani@ua141d10.elisa.omakaista.fi
3d7d8af3aa
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 15:01:04 +02:00
jani@ua141d10.elisa.omakaista.fi
c66f53e277
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 14:48:09 +02:00
konstantin@mysql.com
d702915356
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-14210
2005-11-03 15:24:55 +03:00
holyfoot@mysql.com
bac54a7774
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 16:19:46 +04:00
holyfoot@deer.(none)
e529fdc5ee
Merging
2005-11-03 16:17:11 +04:00
konstantin@mysql.com
7e3f757f2d
A fix and a test case for Bug#14210 "Simple query with > operator on
...
large table gives server crash": make sure that when a MyISAM temporary
table is created for a cursor, it's created in its memory root,
not the memory root of the current query.
2005-11-03 14:20:13 +03:00
jani@ua141d10.elisa.omakaista.fi
b8248334d9
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-11-03 13:02:05 +02:00
holyfoot@mysql.com
401d19f036
Merge mysql.com:/home/hf/work/mysql-4.1.14183
...
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 14:58:36 +04:00
evgen@moonbone.local
55790f74bb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14093-bug-5.0-mysql
2005-11-03 13:55:08 +03:00
holyfoot@mysql.com
e9f256e2bd
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 14:54:13 +04:00
evgen@moonbone.local
30fdafea76
Fix bug #14093 Query takes a lot of time when date format is not valid
...
Invalid date like 2000-02-32 wasn't converted to int, which lead to not
using index and comparison with field as astring, which results in slow
query execution.
convert_constatn_item() and get_mm_leaf() now forces MODE_INVALID_DATES to
allow such conversion.
2005-11-03 13:53:49 +03:00
jani@ua141d10.elisa.omakaista.fi
8243eee9db
Added test-force to Makefile.
2005-11-03 11:47:54 +02:00
msvensson@neptunus.(none)
d028e8e063
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 10:34:15 +01:00