database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
62,929 Commits 3,280 Branches 1,098 Tags
c7fc8045cb15f7edc587b133337aa28bc1dd9cc5
Commit Graph

26958 Commits

Author SHA1 Message Date
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bb3b6ae72c Merge mysql.com:/home/ram/work/b27515/b27515.4.1 
into  mysql.com:/home/ram/work/b27515/b27515.5.0
 2007-04-24 10:27:59 +05:00
iggy@recycle.(none)
e251139c80 Merge recycle.(none):/src/mysql-5.1-maint 
into  recycle.(none):/src/mysql-5.1-maint_25141
 2007-04-23 17:04:24 -04:00
iggy@recycle.(none)
ba01167cec Merge recycle.(none):/src/mysql-5.1-maint 
into  recycle.(none):/src/mysql-5.1-maint_27691
 2007-04-23 16:46:17 -04:00
iggy@recycle.(none)
4bde20d175 Bug #27691 bk compilation with VC++ 2005 fails 
- Added appropiate casts.
 2007-04-23 16:42:57 -04:00
iggy@recycle.(none)
4a50d613df Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug24732/my50-bug24732
 2007-04-23 16:36:40 -04:00
iggy@recycle.(none)
7c68e6893c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug24732/my51-bug24732
 2007-04-23 16:35:20 -04:00
iggy@recycle.(none)
13b54aa963 Bug#24732 Executables do not include Vista manifests 
- Post merge cleanup.
 2007-04-23 16:23:32 -04:00
iggy@recycle.(none)
7a358c4b5c Bug#24732 Executables do not include Vista manifests 
- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.
 2007-04-23 15:41:24 -04:00
iggy@recycle.(none)
193e154ed4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug25621/my50-bug25621
 2007-04-23 14:38:43 -04:00
iggy@recycle.(none)
0b88f8c74c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug25621/my51-bug25621
 2007-04-23 14:37:32 -04:00
iggy@recycle.(none)
b8ac729f9d Merge recycle.(none):/src/bug25621/my50-bug25621 
into  recycle.(none):/src/bug25621/my51-bug25621
 2007-04-23 14:34:10 -04:00
iggy@recycle.(none)
30d6cf311a Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit 
- On Windows, connection handlers while exiting properly did not 
decrement the server's thread count.
 2007-04-23 14:28:33 -04:00
iggy@recycle.(none)
2a54abd582 Bug#25141 Crash Server on Partitioning command 
- The function build_table_filename() builds up a string unconditionally 
using the forward slash as a path separator. Later, when the string is 
searched for FN_LIBCHAR by the set_up_table_before_create() function, a 
null pointer is returned that is finally used by strlen in the 
append_file_to_dir() function which causes the crash.
 2007-04-23 13:50:34 -04:00
serg@janus.mylan
3e87e65b0a warning added 2007-04-23 19:05:38 +02:00
msvensson@pilot.blaudden
2ac94c30f4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 17:01:02 +02:00
kaa@polly.local
9a99aa8155 Fix for bug #22364 "Inconsistent "matched rows" when executing UPDATE" 
In multi_update::send_data(), the counter of matched rows was not correctly incremented, when during insertion of a new row to a temporay table it had to be converted from HEAP to MyISAM.

This fix changes the logic to increment the counter of matched rows in the following cases:
1. If the error returned from write_row() is zero.
2. If the error returned from write_row() is non-zero, is neither HA_ERR_FOUND_DUPP_KEY nor HA_ERR_FOUND_DUPP_UNIQUE, and a call to create_myisam_from_heap() succeeds.
 2007-04-23 18:22:33 +04:00
msvensson@pilot.blaudden
dcd914e24e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 16:22:01 +02:00
gkodinov/kgeorge@magare.gmz
429371f9d5 - addendum of the fix for bug 27786: 
applied the new function is_union() to places
  in the code that check the same condition.
- 5.0->5.1 merge fixes
 2007-04-23 14:16:49 +03:00
mskold/marty@mysql.com/linux.site
91fb8b646f Changed void* to const NdbDictionary::Table* 2007-04-23 12:12:44 +02:00
msvensson@pilot.blaudden
d1de41c59a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 12:05:00 +02:00
joerg@debian.(none)
9c04bfed83 Merge debian.(none):/M50/mysql-5.0 
into  debian.(none):/M50/push-5.0
 2007-04-23 11:31:11 +02:00
mskold/marty@mysql.com/linux.site
4ce556cdde Changed descriptive comment 2007-04-23 11:27:13 +02:00
mskold/marty@mysql.com/linux.site
5d4f9e22b1 Moved all code related to engine_condition_pushdown to a new class, 
ha_ndbcluster_cond.
Added new files:
sql/ha_ndbcluster_cond.h
sql/ha_ndbcluster_cond.cc
 2007-04-23 11:25:33 +02:00
joerg@debian.(none)
94008df3e0 Merge debian.(none):/M51/mysql-5.1 
into  debian.(none):/M51/push-5.1
 2007-04-23 11:21:15 +02:00
mjorgensen@blade09.mysql.com
7855ae51f0 Merge bk-internal:/home/bk/mysql-5.1 
into  blade09.mysql.com:/tmp/mmj/mysql-5.1-runtime
 2007-04-21 18:35:01 +02:00
sergefp@mysql.com
a249a0acaa Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug27939
 2007-04-21 20:27:39 +04:00
ibabaev@bk-internal.mysql.com
c22d6fbb2b Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-04-21 03:51:51 +02:00
ibabaev@bk-internal.mysql.com
c09d1cfe92 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-04-21 00:36:21 +02:00
malff/marcsql@weblab.(none)
2d6d8e2abe Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
 2007-04-20 15:31:41 -06:00
evgen@moonbone.local
4434ff13a9 Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
 2007-04-21 00:33:56 +04:00
sergefp@mysql.com
1f6935d2af Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug27939
 2007-04-21 00:24:43 +04:00
mikael@dator3.(none)
81db111e24 BUG#18198 
Added new test cases, fixed bugs in relation to those
 2007-04-20 18:35:16 +02:00
sergefp@mysql.com
479c8cdaad Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug27939
 2007-04-20 17:30:15 +04:00
lzhou/zhl@dev3-63.(none)
ff7493b3b6 BUG#26675 remove additional varialbes definations in mysqld.cc and add NDBCLUSTER macro in set_var.cc 2007-04-20 12:36:10 +00:00
gshchepa/uchum@gshchepa.loc
6c5d17ef56 Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt 
into  gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
 2007-04-20 16:44:50 +05:00
gshchepa/uchum@gshchepa.loc
4fcf1316bb Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-27704 
into  gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
 2007-04-20 15:31:33 +05:00
joerg@debian.(none)
6ef12bb111 Merge debian.(none):/M50/mysql-5.0 
into  debian.(none):/M50/push-5.0
 2007-04-20 12:31:03 +02:00
gshchepa/uchum@gshchepa.loc
f5a229b3d1 Bug#27704: incorrect comparison of rows with NULL components 
Support for NULL components was incomplete for row comparison,
fixed.  Added support for abort_on_null at compare_row() like
in 5.x
 2007-04-20 15:14:09 +05:00
joerg@debian.(none)
4c00b6fd26 Merge debian.(none):/M51/mysql-5.1 
into  debian.(none):/M51/push-5.1
 2007-04-20 11:58:56 +02:00
gkodinov/kgeorge@magare.gmz
0d70f964aa Merge magare.gmz:/home/kgeorge/mysql/work/B27786-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B27786-addon-5.1-opt
 2007-04-20 12:06:52 +03:00
gkodinov/kgeorge@magare.gmz
bcde01f6ff Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27786-5.0-opt
 2007-04-20 12:01:54 +03:00
mhansson@dl145s.mysql.com
f0fc4b88e0 Bug #24778: Innodb: No result when using ORDER BY 
This bug was intruduced by the fix for bug#17212 (in 4.1). It is not 
ok to call test_if_skip_sort_order since this function will 
alter the execution plan. By contract it is not ok to call 
test_if_skip_sort_order in this context.

This bug appears only in the case when the optimizer has chosen 
an index for accessing a particular table but finds a covering 
index that enables it to skip ORDER BY. This happens in 
test_if_skip_sort_order.
 2007-04-20 11:01:53 +02:00
mats@romeo.(none)
6d0fb7cbfb Merge romeo.(none):/home/bk/merge-mysql-5.0 
into  romeo.(none):/home/bk/merge-mysql-5.1
 2007-04-20 10:55:50 +02:00
mats@romeo.(none)
875de0e571 Merge romeo.(none):/home/bkroot/mysql-5.1-rpl 
into  romeo.(none):/home/bk/merge-mysql-5.1
 2007-04-20 10:46:58 +02:00
tomas@whalegate.ndb.mysql.com
742a4d50e9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-04-20 10:46:34 +02:00
mats@romeo.(none)
f1caa9559c Merge romeo.(none):/home/bkroot/mysql-5.0-rpl 
into  romeo.(none):/home/bk/merge-mysql-5.0
 2007-04-20 10:35:27 +02:00
mats@romeo.(none)
bb73858835 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  romeo.(none):/home/bkroot/mysql-5.0-rpl
 2007-04-20 10:28:44 +02:00
gkodinov/kgeorge@magare.gmz
4c89a5960f Bug #27786: 
When merging views into the enclosing statement
the ORDER BY clause of the view is merged to the
parent's ORDER BY clause.
However when the VIEW is merged into an UNION
branch the ORDER BY should be ignored. 
Use of ORDER BY for individual SELECT statements
implies nothing about the order in which the rows
appear in the final result because UNION by default
produces unordered set of rows.
Fixed by ignoring the ORDER BY clause from the merge
view when expanded in an UNION branch.
 2007-04-20 10:49:45 +03:00
kent/mysqldev@mysql.com/production.mysql.com
ed037928a8 mysql.sln: 
Enable 'mysys' build if target 'Enterprise'
item_subselect.h:
  Fixed bug #27870. The bug that causes crashes manifests itself at some
  conditions when executing an equijoin query with WHERE condition
  containing a subquery predicate of the form join_attr NOT IN (SELECT ...).
 2007-04-19 22:56:04 +02:00
df@pippilotta.erinye.com
c31b50cd30 BUG#27818 comedy of errors 2007-04-19 18:58:32 +02:00