Commit graph

32484 commits

Author SHA1 Message Date
igor@rurik.mysql.com
d6af1b6e39 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-01 02:57:56 -08:00
aivanov@mysql.com
9f57adf0ff Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
2006-04-01 14:57:55 +04:00
igor@rurik.mysql.com
d1bfeb7520 Added a test case for bug #16504.
Results changed after the bug fix.
2006-03-31 23:12:05 -08:00
igor@rurik.mysql.com
af2d79a771 Fixed bug #16504.
Multiple equalities were not adjusted after reading constant tables.
It resulted in neglecting good index based methods that could be
used to access of other tables.
2006-03-31 21:26:17 -08:00
reggie@linux.site
57e87c75cc use show_table instead of share 2006-03-31 22:03:13 -06:00
aivanov@mysql.com
27d88eaea6 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
2006-04-01 04:51:54 +04:00
aivanov@mysql.com
aaf513de9d Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss398
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
2006-04-01 04:23:24 +04:00
aivanov@mysql.com
771fb26e58 Applied innodb-5.0-ss398 snapshot.
Fixed BUG#15650: DELETE with LEFT JOIN crashes server
 with innodb_locks_unsafe_for_binlog.
 Fixed compilation problem with non-C99 compilers
 in btr0sea.c
2006-04-01 01:54:15 +04:00
sergefp@mysql.com
dfb37cb3b1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-bug18025-r2
2006-03-31 22:26:04 +04:00
reggie@linux.site
b05f270c1f Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-bug17631
2006-03-31 11:42:12 -06:00
reggie@linux.site
795659e775 cleaned up a few method comments
moved several functions from sql_partition to be member functions
2006-03-31 11:39:44 -06:00
bar@mysql.com
9b41bb7a0a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-31 21:17:38 +05:00
kent@mysql.com
2727df012d Merge 2006-03-31 15:26:51 +02:00
bar@mysql.com
67f26cc432 Merge mysql.com:/usr/home/bar/mysql-5.0.1.2107.1.1
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-31 17:38:00 +05:00
sergefp@mysql.com
da81072823 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-bug18025-r2
2006-03-31 15:20:00 +04:00
sergefp@mysql.com
3886483b54 Fix for BUG#18025: Wrong query results because of bugs in partition pruning:
- Fix typo bug in SEL_ARG::is_singlepoint()
 - In set_up_range_analysis_info(), treat MEDIUMINT as enumerable type just like other integer types
2006-03-31 15:17:15 +04:00
gluh@mysql.com
486a48d46c Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-03-31 13:17:45 +05:00
reggie@linux.site
55a8eb95f2 BUG # 17631 SHOW TABLE STATUS reports wrong engine 2006-03-31 01:02:44 -06:00
igor@rurik.mysql.com
cfb63c4b74 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-03-30 15:45:48 -08:00
kent@mysql.com
ac34c93bc2 Merge 2006-03-30 23:52:54 +02:00
igor@rurik.mysql.com
4cdda34fd3 Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-03-30 13:34:14 -08:00
kent@mysql.com
ece5ef1551 Merge 2006-03-30 22:10:48 +02:00
igor@rurik.mysql.com
ea2aaa4e2f Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-03-30 11:34:14 -08:00
konstantin@mysql.com
3ec14cd1d6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-03-30 23:20:09 +04:00
sergefp@mysql.com
c67ed1ee8c Fix incorrect merge: put '/*' comment start back. 2006-03-30 22:35:50 +04:00
konstantin@mysql.com
08eff11273 Merge mysql.com:/opt/local/work/tmp_merge2
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-03-30 19:12:10 +04:00
evgen@sunlight.local
2eae9b0a18 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into sunlight.local:/local_work/15560-bug-5.0-mysql
2006-03-30 19:05:55 +04:00
evgen@sunlight.local
7e4535e285 item_sum.cc, sql_select.cc:
After merge fix for bug#15560
item_sum.h:
   After merge fix for bug#15560
2006-03-30 19:04:21 +04:00
konstantin@mysql.com
365c7aea3a Merge mysql.com:/opt/local/work/tmp_merge1
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-03-30 19:01:36 +04:00
konstantin@mysql.com
5c99b8b83f Merge mysql.com:/opt/local/work/tmp_merge
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-03-30 18:43:42 +04:00
hakan@lu0008.wdf.sap.corp
9b9ebd83eb Hakan Kuecuekyilmaz 2006-03-30 15:54:32 +02:00
evgen@sunlight.local
eb075f2255 Manual merge 2006-03-30 17:14:55 +04:00
petr@mysql.com
0250c0115d 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-30 16:32:53 +04:00
petr@mysql.com
5d448351f2 fix csv test failure on non-linux platforms 2006-03-30 16:30:30 +04:00
knielsen@mysql.com
da000b2d2a Fix AIX compile failure. 2006-03-30 11:12:24 +02:00
knielsen@mysql.com
ce4463a139 Add some stuff to source package needed for CMake Windows packaging. 2006-03-30 11:02:52 +02:00
bar@mysql.com
c5cd39b29a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2006-03-30 13:04:58 +05:00
evgen@sunlight.local
47f9b46564 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sunlight.local:/local_work/15560-bug-4.1-mysql
2006-03-30 10:22:03 +04:00
kent@mysql.com
2618be804d Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-30 08:13:49 +02:00
kent@mysql.com
59a30d07bf btr0sea.c:
Added BTR_CHUNK_SIZE, removed 'chunk_size' declared after declaration block
2006-03-30 08:10:03 +02:00
kent@mysql.com
46d0edb8cc 2006-03-30 06:53:39 +02:00
kent@mysql.com
ae532e2611 Merge 2006-03-30 06:48:40 +02:00
gluh@eagle.intranet.mysql.r18.ru
70a8f32d81 post-merge fix 2006-03-30 09:13:25 +05:00
gluh@mysql.com
ea56026e4f Merge 2006-03-30 08:13:28 +05:00
monty@mysql.com
2b1f521286 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-03-30 06:11:34 +03:00
igor@rurik.mysql.com
0440cc75bd Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-03-29 17:54:01 -08:00
acurtis@xiphis.org
6cbd57914a Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  xiphis.org:/home/antony/work2/p1-bug18464
2006-03-29 17:31:59 -08:00
igor@rurik.mysql.com
0f9ab67d41 Fixed bug #18279: crash in the cases when on conditions are moved
out of a nested join to the on conditions for the nest.
The bug happened due to:
1. The function simplify_joins could change on expressions for nested joins.
   Yet modified on expressions were not saved in prep_on_expr.
2. On expressions were not restored for nested joins in 
   reinit_stmt_before_use.
2006-03-29 16:45:29 -08:00
monty@mysql.com
eb9bc92d11 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2006-03-30 03:32:58 +03:00
monty@mysql.com
c04660e85e Cleanup during review of new pushed code 2006-03-30 03:11:37 +03:00