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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
brian@zim.(none)
|
9faf18d3b6
|
Filed bugs against two tests, and then disabled them.
|
2006-03-28 00:24:13 -08:00 |
|
knielsen@mysql.com
|
cc57e4e01b
|
Manual merge.
|
2006-03-28 10:07:03 +02:00 |
|
mskold@mysql.com
|
6e0d4d2d45
|
Added tests with IGNORE and NULL values
|
2006-03-28 10:01:23 +02:00 |
|
mskold@mysql.com
|
c76ab0a4f6
|
Fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text)
|
2006-03-28 09:59:20 +02:00 |
|
igor@rurik.mysql.com
|
8cb3cf2382
|
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into rurik.mysql.com:/home/igor/mysql-5.1
|
2006-03-27 20:26:57 -08:00 |
|
igor@rurik.mysql.com
|
df80048d5f
|
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
|
2006-03-27 20:16:52 -08:00 |
|
ian@zim.(none)
|
9caff206c2
|
Merge zim.(none):/home/ian/workspace/mysql-5.0
into zim.(none):/home/ian/workspace/mysql-5.1-new
Updated bug message in disabled file -Brian
|
2006-03-27 19:48:44 -08:00 |
|
igor@rurik.mysql.com
|
22d66dccd6
|
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
|
2006-03-27 18:30:40 -08:00 |
|
igor@rurik.mysql.com
|
f57e0b3db7
|
Fixed bug #18386.
An invalid assertion in Item_direct_view_ref::eq caused
an assertion abort in the debug version.
|
2006-03-27 18:28:55 -08:00 |
|
ian@zim.(none)
|
34b54fa83c
|
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/ian/workspace/mysql-5.0
|
2006-03-27 18:27:57 -08:00 |
|
ian@zim.(none)
|
8607f1df65
|
Disable udf test
|
2006-03-27 18:25:35 -08:00 |
|
brian@zim.(none)
|
1ec1587cd3
|
Removing deleted file (this fixes the pushbuild failure from Reggie's push).
There still may be issues on the Window's side from what I can see from doing a grep.
|
2006-03-27 18:20:43 -08:00 |
|
brian@zim.(none)
|
eee6a51caf
|
Disabling test for rpl_ndb_sp007
|
2006-03-27 18:08:31 -08:00 |
|
ian@zim.(none)
|
a66aace3e9
|
Fix for bug #16855
|
2006-03-27 17:45:06 -08:00 |
|
kent@mysql.com
|
1da875b233
|
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
|
2006-03-28 01:56:24 +02:00 |
|
reggie@big_geek.
|
7f674749b8
|
removed handlerton-win.cc
now using CONFIGURE_FILE and INCLUDE to generate handlerton.cc and to set the definitions based on
the storage engines given on the command line
|
2006-03-27 15:19:56 -06:00 |
|
kent@mysql.com
|
6b51a2c69f
|
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
|
2006-03-27 23:08:25 +02:00 |
|
kent@mysql.com
|
04f059c5bf
|
mysql_config.sh:
Remove Solaris -xc99=none C option as C++ compiler can't handle it
|
2006-03-27 23:04:44 +02:00 |
|