Commit graph

26941 commits

Author SHA1 Message Date
sergefp@mysql.com
90414dcaaf BUG#13484: In ha_innobase::cmp_ref call Field::key_cmp() as this is the function
that compares key images.
2005-10-01 11:56:01 +04:00
timour@mysql.com
77cf84186e Fix for BUG#13410 - qualified reference to a view column in the HAVING clause cannot be resolved.
The problem was then when a column reference was resolved to a view column, the new Item
created for this column contained the name of the view, and not the view alias.
2005-10-01 09:35:30 +03:00
eric@mysql.com
b2f5281929 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/eric/dev/hton-mysql-5.0
2005-09-30 16:28:47 -07:00
eric@mysql.com
5008a5f208 Move handler specific options into handlerton flag check
BUG#13108
2005-09-30 16:26:48 -07:00
anozdrin@mysql.com
d3c0fd2bce WL#2789 "Instance Manager: test using mysql-test-run testing framework"
Add Instance Manager tests.
2005-10-01 01:14:50 +04:00
anozdrin@mysql.com
c73e03ff22 WL#2789 "Instance Manager: test using mysql-test-run testing framework"
1) Add support to testing Instance Manager in daemon mode;
2) Don't run Instance Manager tests when running with --ps-protocol option;
2005-10-01 01:12:14 +04:00
kent@mysql.com
aef1f4cd2e Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-30 22:37:55 +02:00
kent@mysql.com
185b5636f4 Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-09-30 22:01:34 +02:00
serg@mysql.com
78001860a6 Merge 2005-09-30 20:30:09 +02:00
serg@serg.mylan
1a1030ffcd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-30 20:24:22 +02:00
serg@serg.mylan
bef3c587c6 Bug#11238
"SELECT ... FOR UPDATE executed as consistent read inside LOCK TABLES"
Do not discard lock_type information as handler::start_stmt() may require knowledge.
(fixed by Antony)
2005-09-30 20:20:10 +02:00
dlenev@mysql.com
09370d6527 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13629
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-09-30 21:45:20 +04:00
dlenev@mysql.com
85d4bc8f1b Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13629
2005-09-30 20:28:24 +04:00
hartmut@mysql.com
16cd4bd332 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-09-30 18:16:57 +02:00
hartmut@mysql.com
95525485b2 CygWin build fix (Bug #13640) 2005-09-30 18:06:38 +02:00
msvensson@neptunus.(none)
92b1d080c9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
2005-09-30 16:51:35 +02:00
kent@mysql.com
c72092bdab Many files:
Revert back 5.0 changes to Visual Studio .Net project files
2005-09-30 16:44:31 +02:00
kent@mysql.com
7b2e04d5a2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-09-30 16:37:02 +02:00
kent@mysql.com
664503deca Removed all Visual Studio .Net .vcproj files to be able to
back-port to 4.1 and merge forward to 5.x again properly.
2005-09-30 16:33:27 +02:00
timour@mysql.com
1740f72305 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-13597
2005-09-30 17:01:55 +03:00
dlenev@mysql.com
e0cfaeaaf6 Fix for bug #13629 "view test crashes for debug build" (also includes better
fix for bug #13451 "view test produces warning about unfreed memory").
2005-09-30 17:30:33 +04:00
marko@hundin.mysql.fi
96d77a34e9 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  hundin.mysql.fi:/home/marko/mysql-4.1
2005-09-30 16:02:19 +03:00
marko@hundin.mysql.fi
4dcd698b86 Merge hundin.mysql.fi:/home/marko/mysql-4.1
into  hundin.mysql.fi:/home/marko/mysql-5.0-bk
2005-09-30 15:56:01 +03:00
kent@mysql.com
ea3baa035f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-30 14:34:39 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ae745ef283 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 15:29:01 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
ff2da1c0ca Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 15:17:37 +03:00
marko@hundin.mysql.fi
17b0098127 InnoDB: After review fix 2005-09-30 15:06:41 +03:00
kent@mysql.com
f3cb039c0b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-30 14:06:08 +02:00
kent@mysql.com
21cf818a8d Many files:
New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
2005-09-30 14:03:55 +02:00
jonas@perch.ndb.mysql.com
ffa4d71c97 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-30 13:42:10 +02:00
jonas@perch.ndb.mysql.com
a9417648fd ndb -
Fix compile error with gcc296
2005-09-30 13:40:02 +02:00
joerg@mysql.com
1345d1bf87 Raise the version. 2005-09-30 13:37:19 +02:00
jonas@perch.ndb.mysql.com
78ba02f26e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-30 13:18:31 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b97a77e824 Fix for Bug#12629, "mysqld_multi produces syntax error".
Quote here is unneccessary as it should all be handled in
quote_opt_arg().
2005-09-30 14:02:31 +03:00
marko@hundin.mysql.fi
8c1ccbc903 InnoDB: On UPDATE, trim UCS2 columns correctly. (Bug #12178) 2005-09-30 13:58:00 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
26b3ef7f44 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 13:56:32 +03:00
joerg@mysql.com
ac259199e0 Merge mysql.com:/M50/noserver-5.0 into mysql.com:/M50/mysql-5.0 2005-09-30 12:49:14 +02:00
joerg@mysql.com
c90673de8b Change "mf_keycache.c" so that it can be compiled without thread support (bug#11680):
"configure --without-server"   (without giving "--enable-thread-safe-client").
2005-09-30 12:44:45 +02:00
jonas@perch.ndb.mysql.com
aa10174652 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-30 12:27:39 +02:00
jonas@perch.ndb.mysql.com
6169d529e5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-30 12:25:46 +02:00
jonas@perch.ndb.mysql.com
b43d0f0495 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-30 12:25:39 +02:00
jonas@perch.ndb.mysql.com
f334a14952 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-30 12:24:56 +02:00
jonas@perch.ndb.mysql.com
2722dff13f Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-30 12:24:03 +02:00
jonas@perch.ndb.mysql.com
bb70442366 ndb_config
Check returnvalue on load/fetch configuration
2005-09-30 12:22:00 +02:00
sergefp@mysql.com
49954f6735 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-sept30-test
2005-09-30 14:21:10 +04:00
sergefp@mysql.com
3625ec5127 BUG#13081: Disable ROR-index_merge for NDB tables (by adding a
HA_KEY_SCAN_NOT_ROR index flag) as NDB index scans are not guaranteed to be ROR 
scans.
2005-09-30 14:20:15 +04:00
jonas@perch.ndb.mysql.com
6cff2db932 ndb
Add support/test for using my.cnf [cluster_config]
2005-09-30 12:19:15 +02:00
serg@serg.mylan
fff2737b0e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-30 12:04:10 +02:00
serg@serg.mylan
8c813c0a16 duplicate error message removed 2005-09-30 12:01:39 +02:00
jonas@perch.ndb.mysql.com
1e6f19074e Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-30 11:42:33 +02:00