mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36238 commits 2793 branches 343 tags 1.7 GiB
Commit graph

36238 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.blaudden
4a1fd222ce Don't copy any subdirs in scripts/ 2007-04-23 18:16:57 +02:00
gkodinov/kgeorge@magare.gmz
58320dfe42 Merge magare.gmz:/home/kgeorge/mysql/work/B27811-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27811-5.0-opt
 2007-04-23 19:02:40 +03: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
975815280a Bug #27811: 
FORCE_INIT_OF_VARS was not defined for the 
 debug builds on Windows. This caused LINT_INIT
 macro to be defined as NOP and this triggers
 false alarms about use of uninitialized with
 the runtime libs of some Visual Studio versions.
 Fixed by defining FORCE_INIT_OF_VARS to match the
 state of the Windows
 2007-04-23 17:15:51 +03:00
msvensson@pilot.blaudden
1561c39c5d Add "name of struct" as first arg to comp_sql 
Fix "make distcheck"
 2007-04-23 14:01:48 +02:00
joerg@debian.(none)
4fbdddf28d dbug/dbug_analyze.c : Avoid the unresolved symbol "my_thread_global_init()" 
in a build "--without-server".

Fix for bug#14685
 2007-04-23 13:36:18 +02:00
msvensson@pilot.blaudden
7ddc33753e Use a temp variable "error" for storing return code of pclose 
so the WEXITSTATUS macro can "fiddle" with it as it so pleases
 2007-04-23 13:27:55 +02:00
msvensson@pilot.blaudden
714c36ce27 It's not possible to use the return value of fputs 
to check if the creation of mysql_upgrade_info suceeded.
Instead use 'upgrade_already_done' to check that file was
created properly.
 2007-04-23 13:07:49 +02:00
msvensson@pilot.blaudden
b11a1c8fd4 Update test to work also when --pager does not exist in "mysql" 2007-04-23 12:58:35 +02: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
msvensson@pilot.blaudden
10181a7fa7 Fix warnings reported by icc 2007-04-23 12:02:58 +02:00
msvensson@pilot.blaudden
a31fce0a6c Remove left over file abi_check 2007-04-23 11:46:47 +02:00
msvensson@pilot.blaudden
a23eeb620c Remove left over file fix_priv_tabs.result 2007-04-23 11:41:55 +02:00
joerg@debian.(none)
e791812895 Merge debian.(none):/M41/mysql-4.1 
into  debian.(none):/M41/push-4.1
 2007-04-23 11:36:30 +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
df@pippilotta.erinye.com
1cde557311 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-04-23 11:18:03 +02:00
msvensson@pilot.blaudden
7411813e48 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 11:03:40 +02:00
msvensson@pilot.blaudden
d26965c361 Protect against killing pid's that would "killall" or "kill self" 2007-04-23 11:01:22 +02:00
df@pippilotta.erinye.com
02d6b57fb4 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-27701 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-04-23 10:48:36 +02:00
mjorgensen@blade09.mysql.com
121bc31b4a Merge bk-internal:/home/bk/mysql-5.0 
into  blade09.mysql.com:/tmp/mmj/mysql-5.0-runtime
 2007-04-21 18:36:06 +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
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)
fc36313733 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-04-20 15:34:04 -06:00
mtaylor@qualinost.(none)
0690dac3aa Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-debian
 2007-04-20 14:09:43 -07: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
cmiller@zippy.cornsilk.net
219f3fb7c6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-04-20 13:57:24 -04:00
cmiller@zippy.cornsilk.net
0b69216315 Avoid compiler warnings. 2007-04-20 13:49:06 -04:00
kent@mysql.com/kent-amd64.(none)
75c31f6bb9 Makefile.am: 
Typo
 2007-04-20 15:52:49 +02:00
kent@mysql.com/kent-amd64.(none)
9050451afe Makefile.am: 
Added the 'suite' directory to the source TAR and install
 2007-04-20 15:49:35 +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
mats@romeo.(none)
f4c4de6a56 Added missing result file for rpl_critical_errors. 2007-04-20 14:08:12 +02: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
tomas@whalegate.ndb.mysql.com
53cee9f2bf Construction does not work on hpux aCC, so some refactoring 2007-04-20 12:37:32 +02:00
joerg@debian.(none)
ade0e424c0 Merge debian.(none):/M41/push-4.1 
into  debian.(none):/M50/push-5.0
 2007-04-20 12:35:35 +02: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
joerg@debian.(none)
88d88e7f7a Merge debian.(none):/M50/bug27739-5.0 
into  debian.(none):/M50/push-5.0
 2007-04-20 12:25:50 +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
kent/mysqldev@mysql.com/production.mysql.com
8378813628 testScanFilter.cpp: 
Corrected copyright header
 2007-04-20 11:53:53 +02: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
joerg@debian.(none)
5de73f45f9 configure.in : Ensure that "icheck" is really the ABI checker, 
not some other tool (file system checker on Tru64).

Patch originally supplied by Peter O'Gorman, slightly modified by me.

Bug#27739 "build fails on Tru64 due to icheck test in configure"
 2007-04-20 10:51:53 +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
tomas@whalegate.ndb.mysql.com
fcb7246406 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
 2007-04-20 10:03:18 +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