Commit graph

36284 commits

Author SHA1 Message Date
unknown
b570cee115 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


CMakeLists.txt:
  Bug #27811: added the missing build option
mysql-test/r/windows.result:
  Bug #27811: test case
mysql-test/t/windows.test:
  Bug #27811: test case
2007-04-23 17:15:51 +03:00
unknown
b44eee2a67 Add "name of struct" as first arg to comp_sql
Fix "make distcheck"


scripts/CMakeLists.txt:
  Add "name of struct" as first arg to comp_sql
scripts/comp_sql.c:
  Add "name of struct" as first arg to comp_sql
2007-04-23 14:01:48 +02:00
unknown
e67c28ca49 dbug/dbug_analyze.c : Avoid the unresolved symbol "my_thread_global_init()"
in a build "--without-server".

Fix for bug#14685


dbug/dbug_analyze.c:
  In a build "--without-server", the libraries will be built without threading.
  In this case, "my_thread_global_init()" is missing in the libraries, and the 
  linker will report an unresolved symbol.
  
  Avoid this error by making the call to "my_thread_global_init()" depend on 
  "#ifdef THREAD".
  
  Fix for bug#14685
2007-04-23 13:36:18 +02:00
unknown
09e6e6618f 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
unknown
f1e81f6c8d 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
unknown
77d0d996be Update test to work also when --pager does not exist in "mysql" 2007-04-23 12:58:35 +02:00
unknown
417eba8384 Changed void* to const NdbDictionary::Table* 2007-04-23 12:12:44 +02:00
unknown
b3e3c3881e Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


Makefile.am:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2007-04-23 12:05:00 +02:00
unknown
6a05f2af3c Fix warnings reported by icc 2007-04-23 12:02:58 +02:00
unknown
166af98f44 Remove left over file abi_check
BitKeeper/deleted/.del-abi_check:
  Delete: include/abi_check
2007-04-23 11:46:47 +02:00
unknown
18ea538648 Remove left over file fix_priv_tabs.result
BitKeeper/deleted/.del-fix_priv_tabs.result:
  Delete: mysql-test/r/fix_priv_tabs.result
2007-04-23 11:41:55 +02:00
unknown
7d954c94fd Merge debian.(none):/M41/mysql-4.1
into  debian.(none):/M41/push-4.1
2007-04-23 11:36:30 +02:00
unknown
b0dc094804 Merge debian.(none):/M50/mysql-5.0
into  debian.(none):/M50/push-5.0
2007-04-23 11:31:11 +02:00
unknown
c067b03c86 Changed descriptive comment 2007-04-23 11:27:13 +02:00
unknown
c40726c3ce 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


sql/ha_ndbcluster_cond.cc:
  BitKeeper file /windows/Linux_space/MySQL/mysql-5.0-ndb/sql/ha_ndbcluster_cond.cc
sql/ha_ndbcluster_cond.h:
  BitKeeper file /windows/Linux_space/MySQL/mysql-5.0-ndb/sql/ha_ndbcluster_cond.h
sql/Makefile.am:
  Added compilation of new separate files for engine_condition_pushdown
sql/ha_ndbcluster.cc:
  Moved all code related to engine_condition_pushdown to ha_ndbcluster_cond
sql/ha_ndbcluster.h:
  Moved all code related to engine_condition_pushdown to ha_ndbcluster_cond
2007-04-23 11:25:33 +02:00
unknown
aeeb2df0bd 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
unknown
984d8e23d6 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_process.pl:
  Auto merged
2007-04-23 11:03:40 +02:00
unknown
d19d4b3f4f Protect against killing pid's that would "killall" or "kill self" 2007-04-23 11:01:22 +02:00
unknown
aa8c240f93 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
unknown
c94da3764f 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
unknown
b2bd69adbf Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/psergey/mysql-5.0-bug27939


sql/sql_select.cc:
  Auto merged
2007-04-21 20:27:39 +04:00
unknown
8a702a1e7b Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt


sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2007-04-21 00:36:21 +02:00
unknown
594f7bd2fe Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
2007-04-20 15:34:04 -06:00
unknown
b873193ab6 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
unknown
5fb275a6f5 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
unknown
4868ef1d80 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
unknown
1c04850b95 Avoid compiler warnings. 2007-04-20 13:49:06 -04:00
unknown
0d3c448353 Makefile.am:
Typo


mysql-test/Makefile.am:
  Typo
2007-04-20 15:52:49 +02:00
unknown
79476ab29d Makefile.am:
Added the 'suite' directory to the source TAR and install


mysql-test/Makefile.am:
  Added the 'suite' directory to the source TAR and install
2007-04-20 15:49:35 +02:00
unknown
d5ca6582b4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/psergey/mysql-5.0-bug27939


sql/sql_select.cc:
  Auto merged
2007-04-20 17:30:15 +04:00
unknown
4a3027aaa2 Added missing result file for rpl_critical_errors.
mysql-test/r/rpl_critical_errors.result:
  New BitKeeper file ``mysql-test/r/rpl_critical_errors.result''
2007-04-20 14:08:12 +02:00
unknown
323a213539 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
unknown
c441a3dc34 Construction does not work on hpux aCC, so some refactoring 2007-04-20 12:37:32 +02:00
unknown
11fe01f58f Merge debian.(none):/M41/push-4.1
into  debian.(none):/M50/push-5.0
2007-04-20 12:35:35 +02:00
unknown
a501fdd695 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


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/row.test:
  Auto merged
mysql-test/r/row.result:
  Test case updated for Bug#27704 (incorrect comparison
  of rows with NULL components).
sql/item_cmpfunc.cc:
  Bug#27704: incorrect comparison of rows with NULL components.
sql/item_cmpfunc.h:
  Bug#27704: incorrect comparison of rows with NULL components.
  Cosmetic fix.
2007-04-20 15:31:33 +05:00
unknown
515c64875b Merge debian.(none):/M50/mysql-5.0
into  debian.(none):/M50/push-5.0


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
2007-04-20 12:31:03 +02:00
unknown
ad14c2475b Merge debian.(none):/M50/bug27739-5.0
into  debian.(none):/M50/push-5.0


configure.in:
  Auto merged
2007-04-20 12:25:50 +02:00
unknown
a8f639fccc 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


sql/item_cmpfunc.h:
  Bug#27704: incorrect comparison of rows with NULL components
  Added support for abort_on_null at Item_bool_func2
  like in 5.x
sql/item_cmpfunc.cc:
  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
mysql-test/t/row.test:
  Test case updated for Bug#27704 (incorrect comparison 
  of rows with NULL components)
mysql-test/r/row.result:
  Test case updated for Bug#27704 (incorrect comparison 
  of rows with NULL components)
mysql-test/r/subselect.result:
  Test case updated for Bug#27704 (incorrect comparison 
  of rows with NULL components)
2007-04-20 15:14:09 +05:00
unknown
20b25f6aaa testScanFilter.cpp:
Corrected copyright header


ndb/test/ndbapi/testScanFilter.cpp:
  Corrected copyright header
2007-04-20 11:53:53 +02:00
unknown
a4ffe9e435 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
unknown
f3e261a997 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.


mysql-test/r/key.result:
  Bug#24778
  
  test case.
  
  The bug causes the result to be the empty set.
mysql-test/t/key.test:
  Bug#24778
  
  The minimal test case that reveals the bug. The reason for such a 
  complicated schema is that we have to convince the optimizer to 
  pick one index, then discard it in order to be able to skip 
  ORDER BY.
sql/sql_select.cc:
  bug#24778
  
  Removed the call to test_if_skip_sort_order that constituted the
  bug.
2007-04-20 11:01:53 +02:00
unknown
26aba3fb2c 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"


configure.in:
  We use "icheck" as a tool to check against ABI changes.
  However, some systems (like Tru64) have "icheck" as a file system checker.
  So if "icheck" is found, it should be verified that this really is the
  ABI checker and not some other tool.
  
  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
unknown
8bc4d18289 Merge romeo.(none):/home/bkroot/mysql-5.0-rpl
into  romeo.(none):/home/bk/merge-mysql-5.0


client/mysql.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2007-04-20 10:35:27 +02:00
unknown
b6451440b7 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
unknown
ff18ecfbef 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
unknown
e0444ba436 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.


mysql-test/r/view.result:
  Bug #27786: test case
mysql-test/t/view.test:
  Bug #27786: test case
sql/sql_lex.h:
  Bug #27786: add a is_union() inlined function
  Returns true if the unit represents an UNION.
sql/sql_view.cc:
  Bug #27786: ignore ORDER BY in mergeable views when in UNION context
2007-04-20 10:49:45 +03:00
unknown
1f6c9a58fb Remove comment 2007-04-20 07:20:26 +02:00
unknown
3bf8b48e0d Change mode to -rw-rw-r-- 2007-04-19 21:59:25 -07:00
unknown
855cb38059 Made default changelog a little more generic. 2007-04-19 21:58:36 -07:00
unknown
3010164111 control.in:
Left a stray space in. 


debian/control.in:
  Left a stray space in.
2007-04-20 03:50:11 +02:00