Commit graph

28,542 commits

Author SHA1 Message Date
mskold@mysql.com
6d5ef98adc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-11-25 10:56:01 +01:00
lenz@mysql.com
ce50088e27 Compile more stuff during make dist to detect more errors already during bootstrap. 2005-11-25 10:48:42 +01:00
kent@mysql.com
708b8ff014 Fix VS project files following move of storage engines below storage/. 2005-11-25 10:46:28 +01:00
mskold@mysql.com
c2acc2da99 Updated expected error 2005-11-25 10:41:22 +01:00
knielsen@mysql.com
866ea4552f Fix example storage engine following table def cache updates. 2005-11-25 10:35:26 +01:00
knielsen@mysql.com
4719923781 Mikaels fix for compiling without partition storage engine 2005-11-25 10:33:38 +01:00
mikael@mysql.com
a6c97bb635 Made set_part_info a handler method and not a ha_partition method only
The previous variant where it was a specific ha_partition method
only worked for the partition handler. It was unfortunately called also
for the NDB handler and in this case it called a random method in the
NDB handler with random input.
2005-11-25 09:11:52 +01:00
bar@mysql.com
e6708aa0df Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b14146
2005-11-25 10:08:00 +04:00
brian@zim.(none)
86d0b17c2b Fixing result file from previous merge. 2005-11-24 11:59:41 -08:00
evgen@moonbone.local
7a21129691 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/13293-bug-5.0-mysql
2005-11-24 22:41:52 +03:00
brian@zim.(none)
802f32c1dd Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/mysql-5.1-new
2005-11-24 11:23:44 -08:00
pem@mysql.com
01de5ef5af Remove t3 in join_nested.test 2005-11-24 19:51:52 +01:00
pem@mysql.com
3fd3e277ff Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 19:45:36 +01:00
pem@mysql.com
7d232f01e3 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 19:14:11 +01:00
pem@mysql.com
23cab491e9 Some post-merge cleaning, and made assert THD::store_globals() work at all times. 2005-11-24 19:13:13 +01:00
brian@zim.(none)
33076b8782 Its funny, I am reading through the forums and someone asks "Can I please have a REPLACE INTO, instead an INSERT INTO?" and I remember how often I have used a sed script to modify MySQL dumps to have exactly that.
So, use --replace and instead of getting INSERT INTO you will INSTEAD get REPLACE INTO. Buyer beward, REPLACE is a MySQL SQL, so you will not end up with a dump that can be used for other databases.

Though I hear you could just use a sed line to modify it back :)
2005-11-24 09:56:40 -08:00
serg@serg.mylan
8fb3b83805 don't call handler::info() in SHOW CREATE TABLE 2005-11-24 18:13:08 +01:00
evgen@moonbone.local
e093fb1fd7 Fix bug#13293 Wrongly used index results in endless loop.
Loose index scan using only second part of multipart index was choosen, which
results in creating wrong keys and endless loop.

get_best_group_min_max() now allows loose index scan for distinct only if used
keyparts forms a prefix of the index.
2005-11-24 19:54:02 +03:00
holyfoot@deer.(none)
e906120ba8 Fix for bug #14693 (ALTER COLUMN SET DEFAULT has no effect) 2005-11-24 20:24:45 +04:00
msvensson@devsrv-b.mysql.com
8f457699a8 Bug #15168 yassl failure on amd64
- Use libtool to build libraries
2005-11-24 17:17:36 +01:00
evgen@moonbone.local
e3cab037bf Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14482-bug-4.1-mysql
2005-11-24 19:17:31 +03:00
evgen@moonbone.local
a4a3215a44 Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused
crash

resolve_const_item() substitutes item which will evaluate to constant with
equvalent constant item, basing on the item's result type. In this case
subselect was resolved as constant, and resolve_const_item() was substituting
it's result's Item_caches to Item_null. Later Item_cache's function was called
for Item_null object, which caused server crash.

resolve_const_item() now substitutes constants for items with 
result_type == ROW_RESULT only for Item_rows.
2005-11-24 19:16:51 +03:00
anozdrin@mysql.com
1d1fd3d459 Make it buildable with -ansi flag on some platforms. 2005-11-24 18:42:39 +03:00
anozdrin@mysql.com
ac00e90bd6 Polishing: get rid of C++-style comments. 2005-11-24 18:27:14 +03:00
mskold@mysql.com
f27dc1c232 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-11-24 16:21:49 +01:00
mskold@mysql.com
70d447c1f1 Moved check of wrong schema version earlier 2005-11-24 16:21:07 +01:00
ramil@mysql.com
21a9d6a616 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15047
2005-11-24 18:33:07 +04:00
timour@mysql.com
7397abc0c7 table t7 was not dropped at the end 2005-11-24 16:11:59 +02:00
knielsen@mysql.com
3780c4f4be Tag 5.1.3-alpha cloneoff
Update version number to 5.1.4-alpha
2005-11-24 14:57:16 +01:00
tomas@poseidon.ndb.mysql.com
a2bb99397d added missing errorcode handling in NdbIndexStat causing test failure 2005-11-24 14:57:14 +01:00
pem@mysql.com
eae8414d35 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 14:14:00 +01:00
ramil@mysql.com
a7e46b2dca Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15047
2005-11-24 17:04:54 +04:00
stewart@mysql.com
b513b68c11 small build fix for some compilers 2005-11-25 00:04:53 +11:00
ramil@mysql.com
b55796aff3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15047
2005-11-24 16:59:37 +04:00
lenz@mysql.com
007125b35b Merge lgrimmer@bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/space/my/mysql-5.1
2005-11-24 13:39:56 +01:00
lenz@mysql.com
564ff2c798 - fixed a compile error in mysys/mf_tempdir.c by adding a missing comma
(only showed up in a non-debug build)
2005-11-24 13:26:47 +01:00
msvensson@neptunus.(none)
183bf111d0 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-11-24 13:16:50 +01:00
monty@mysql.com
fb82332bdc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/my/mysql-5.1
2005-11-24 13:36:43 +02:00
tomas@poseidon.ndb.mysql.com
1a95d0a7ea updated test as result of config change done in cluster startup 2005-11-24 12:36:42 +01:00
pem@mysql.com
c5475706f9 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 12:12:49 +01:00
tomas@poseidon.ndb.mysql.com
aeb0512e2c 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-24 11:37:09 +01:00
tomas@poseidon.ndb.mysql.com
40961dd02f added possibility to start ndb cluster with different sized clusters for usage from mysql test run 2005-11-24 11:34:35 +01:00
stewart@mysql.com
2b57e704c3 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug15215
2005-11-24 20:58:06 +11:00
ramil@mysql.com
c0cdfe8599 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15047
2005-11-24 13:42:47 +04:00
monty@mysql.com
2472f0d729 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2005-11-24 11:38:21 +02:00
tomas@poseidon.ndb.mysql.com
68d6b96dd0 added missing drop view at end of test 2005-11-24 09:56:48 +01:00
stewart@mysql.com
15227ff369 BUG#15215 mysqld fails at start-up because of illegal reply from mgmd
In the rare circumstance where a mysqld connects to a mgm server, then the
mgm server goes away before a node id can be allocated, it was possible to get
an Error in mgm protocol parser error message.
2005-11-24 17:30:25 +11:00
monty@mysql.com
b0aecee8af Merge mysql.com:/home/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1-TDC
2005-11-24 06:23:51 +02:00
monty@mysql.com
188295114c Clear variable 2005-11-24 06:17:38 +02:00
monty@mysql.com
a1ee6a03b2 Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/my/mysql-5.1
2005-11-24 06:15:36 +02:00