petr@mysql.com
14346aa9a4
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/cps/mysql/devel/5.1-repair-csv
2006-03-29 06:34:12 +04:00
petr@mysql.com
39a251f35b
Post-review fixes for WL#3154 "Enable REPAIR for CSV tables"
2006-03-29 06:28:57 +04:00
brian@zim.(none)
3d13f61efe
Two additional disabled tests, trying to clear pushbuild.
2006-03-28 18:18:27 -08:00
brian@zim.(none)
097804fbdb
Behavior change to preserve schema unless you specify autogenerated SQL or create values.
2006-03-28 17:59:11 -08:00
brian@zim.(none)
91ea8c05d9
Creating bugs, disabling tests. Trying to get the 5.1 tree clean under pushbuild.
2006-03-28 15:10:06 -08:00
cmiller@zippy.(none)
de5eea6d2e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug11151
2006-03-28 17:38:28 -05:00
acurtis@xiphis.org
f6febdb95a
Bug#18464
...
"Can't make example storage engine available"
Build was attempting a shared-lib build instead of static
2006-03-28 14:34:28 -08:00
cmiller@zippy.(none)
d51158fd1d
Bug#11151: LOAD DATA INFILE commits transaction in 5.0
...
No longer create or commit transactions within the loading of files.
2006-03-28 17:15:45 -05:00
msvensson@shellback.
1d30dfdc00
Remove unused variable
2006-03-28 19:34:44 +02:00
msvensson@shellback.
21001c6df1
Add new paths where to look for mysql_client_test
2006-03-28 19:32:50 +02:00
msvensson@shellback.
67e045986d
Remove duplicate declaration of stress_basdir
2006-03-28 19:30:08 +02:00
msvensson@shellback.
d670ba1e8d
Declare innobase "srv_*" variables as extern "C"
2006-03-28 19:27:38 +02:00
reggie@linux.site
8c0c94af46
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1
2006-03-28 11:12:59 -06:00
reggie@big_geek.
4a166c2f2f
some simple CMAKE updates
2006-03-28 10:05:25 -06:00
bar@mysql.com
b7ffa08728
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-28 20:51:50 +05:00
knielsen@mysql.com
1d40417bd7
Fix files not removed from make dist when deleted.
2006-03-28 17:34:35 +02:00
bar@mysql.com
500e9946d7
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-28 20:09:07 +05:00
reggie@linux.site
f8ed047376
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1
2006-03-28 09:09:06 -06:00
reggie@linux.site
6f4a3685da
restored handlerton-win.cc that I mistakenly deleted.
2006-03-28 09:05:23 -06:00
bar@mysql.com
a586f5a18b
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-28 20:04:50 +05:00
pem@mysql.com
6be4db9a6d
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime
2006-03-28 17:03:14 +02:00
knielsen@mysql.com
4c87c8dc54
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmpbuild
2006-03-28 16:35:50 +02:00
pem@mysql.com
cc17bb3404
Removed forgotten comment line in sql_select.cc.
2006-03-28 16:05:06 +02:00
jonas@perch.ndb.mysql.com
48fa5cb63c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-28 15:40:08 +02:00
bar@mysql.com
4886c53fbb
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15098
2006-03-28 18:32:58 +05:00
jonas@perch.ndb.mysql.com
0a9db2a056
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-28 15:31:26 +02:00
bar@mysql.com
b56bc04c7d
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-28 18:24:04 +05:00
bar@mysql.com
fc86e304cc
cast.result:
...
After merge fix.
2006-03-28 18:21:19 +05:00
pem@mysql.com
e0a2455f19
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime
2006-03-28 15:08:17 +02:00
pem@mysql.com
e51adff01c
Review fix for BUG#17015: Routine name truncation not an error
2006-03-28 15:06:06 +02:00
jonas@perch.ndb.mysql.com
4e819b7377
ndb - bug#17729 bug#18406
...
Ndbapi can reorder recattr when doing sorted scan (for faster comparision)
make sure handler maps correct recattr to correct mysql column
2006-03-28 14:38:16 +02:00
gluh@mysql.com
15ecaa1866
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-03-28 17:26:45 +05:00
gluh@eagle.intranet.mysql.r18.ru
9c82b6746a
Bug#18053 Partitions: crash if null
...
Bug#18070 Partitions: wrong result on WHERE ... IS NULL
removed unnecessary code
added handling of NULL values
2006-03-28 17:25:19 +05:00
pem@mysql.com
1a1da0e3ef
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug16474/mysql-5.0-runtime
2006-03-28 14:18:47 +02:00
pem@mysql.com
b310d4fb4d
Post review fixes for BUG#16474: SP crashed MySQL.
2006-03-28 14:16:21 +02:00
bar@mysql.com
29b8e09732
Merge mysql.com:/usr/home/bar/mysql-4.1.b15098
...
into mysql.com:/usr/home/bar/mysql-5.0
Bug#15098
2006-03-28 17:07:26 +05:00
knielsen@mysql.com
0db859b6df
Merge mysqldev@win2003-x86:my/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-win-src
2006-03-28 13:53:22 +02:00
knielsen@mysql.com
3f2cc44b3d
Clean up CMake configuration following review.
2006-03-28 13:49:29 +02:00
mskold@mysql.com
c85cc93f48
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-28 13:28:36 +02:00
andrey@lmy004.
ebff866137
update result
2006-03-28 13:28:35 +02:00
mskold@mysql.com
cd557bf495
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-28 13:28:34 +02:00
andrey@lmy004.
e2a9045a87
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug14356
2006-03-28 13:28:34 +02:00
tomas@poseidon.ndb.mysql.com
3c6d2e322c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-28 13:28:33 +02:00
konstantin@mysql.com
71defb7a80
A fix and a test case for Bug#15683 "crash, Function on nested
...
VIEWs, Prepared statement": we didn't mark the nested views
as 'prelockng placeholders' when building the prelocking list.
This resulted in these views being processed (merged, materialized)
before they are actually used.
2006-03-28 15:06:29 +04:00
tomas@poseidon.ndb.mysql.com
49ef07fb9d
ndb test: remove not needed setting causing compile error
2006-03-28 11:51:22 +02:00
tomas@poseidon.ndb.mysql.com
b25045beb4
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-28 11:47:49 +02:00
mskold@mysql.com
37a6167d6d
Post review fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text)
2006-03-28 11:46:35 +02:00
msvensson@shellback.
ec825e14e8
Merge bk-internal:/home/bk/mysql-5.1-new
...
into shellback.:C:/mysql/mysql-5.1-new
2006-03-28 11:17:23 +02:00
andrey@lmy004.
fe2e9a903f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug14356
2006-03-28 10:42:46 +02:00
msvensson@shellback.
adc466aa07
Only run test if support partitions
2006-03-28 10:42:28 +02:00