Commit graph

60168 commits

Author SHA1 Message Date
Vladislav Vaintroub
905f48b6f3 fix syntax error in INSTALL cmake command 2010-01-14 15:02:27 +01:00
Vladislav Vaintroub
4d49915cf2 Remove support for "make install" DESTDIR - did not work as expected 2010-01-14 14:54:32 +01:00
Vladislav Vaintroub
b4959030e4 merge 2010-01-14 00:37:44 +00:00
Vladislav Vaintroub
0c4446c617 Fix CFLAGS passed to mysql_config, in case makefile generator is Makefile based 2010-01-14 00:35:07 +00:00
Vladislav Vaintroub
bcb73f8c75 WITH_MYSQLD_LIBS=>WITH_MYSQLD_LDFLAGS 2010-01-14 00:09:40 +01:00
Vladislav Vaintroub
3940981757 Do not link with mtmalloc on Solaris.
add WITH_MYSQLD_LIBS for extra linker flags for mysqld
2010-01-13 21:56:51 +01:00
Vladislav Vaintroub
2da394c645 adjust test result file 2010-01-13 21:31:33 +01:00
Vladislav Vaintroub
937bea7551 merge 2010-01-13 21:16:20 +01:00
Vladislav Vaintroub
b84abb3c40 merge 2010-01-13 21:14:42 +01:00
Vladislav Vaintroub
31f1d18e2c merge 2010-01-13 16:53:22 +01:00
Vladislav Vaintroub
8807608561 use _GNU_SOURCE on Linux to have all useful definitions (pthread_rwlock_t) for example 2010-01-13 16:52:14 +01:00
Vladislav Vaintroub
f3460b2132 Add WITH_FAST_MUTEXES option (non-debug configurations only) 2010-01-13 13:33:32 +01:00
Alexander Nozdrin
51caeae915 Auto-merge from mysql-next-mr-bugfixing. 2010-01-12 19:21:42 +03:00
Vladislav Vaintroub
5c871c9017 Workaround a linker problem on OSX 10.4 2010-01-12 00:31:50 +01:00
Vladislav Vaintroub
ed40723dc9 merge 2010-01-11 17:46:16 +01:00
Alexander Nozdrin
0f300ac6b9 Backporting revision from mysql-6.0-codebase-bugfixing.
Original revision:
------------------------------------------------------------
revno: 3817
revision-id: guilhem@mysql.com-20100108092756-k0zzf4kvx9b7bh38
parent: guilhem@mysql.com-20100107101133-hrrgcdqg508runuf
committer: Guilhem Bichot <guilhem@mysql.com>
branch nick: mysql-6.0-codebase-bugfixing
timestamp: Fri 2010-01-08 10:27:56 +0100
message:
  fix for BUG#50120 "Valgrind errors in any test, inside mysqltest"
  Problem was that as v->name[v->name_len] may be uninitialized (which is ok per se),
  it shouldn't be used in an if(). We remove this zero_the_char/restore_it logic by
  rather zero-terminating the v->name string when we create it in var_init().
------------------------------------------------------------
2010-01-11 19:43:55 +03:00
Alexander Nozdrin
5d61829b29 Backporting revision from mysql-6.0-codebase-bugfixing.
Original revision:

------------------------------------------------------------
revno: 3789.1.9
revision-id: serg@mysql.com-20091229134448-phe834ukzmi0k2e3
parent: serg@mysql.com-20091227081418-bgfg952gzumn1k3h
committer: Sergei Golubchik <serg@mysql.com>
branch nick: 6.0-codebase
timestamp: Tue 2009-12-29 14:44:48 +0100
message:
  better fix for Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds
  
  use setenv instead of putenv
------------------------------------------------------------
2010-01-11 19:42:35 +03:00
Vladislav Vaintroub
4c872d51f6 Add option for specifying MYSQL build configurations.
Add mysql_release.cmake intended for use by the build team (
compile options, build settings to do MySQL releases)
2010-01-11 14:42:07 +01:00
Alexander Nozdrin
724caa519d Auto-merge from mysql-next-mr. 2010-01-11 16:10:51 +03:00
Vladislav Vaintroub
59e6fa7db1 Install docs 2010-01-09 01:16:07 +01:00
Vladislav Vaintroub
4fbd5ccd71 Address Kents comments: copy docs, remove autom4te.cache subdirectory if exists. 2010-01-09 00:38:19 +01:00
vladislav vaintroub
0f0e56b03a CMake 2.6.2 fix 2010-01-08 11:06:42 +01:00
Vladislav Vaintroub
31548075cf Fix error with cmake 2.6 2010-01-08 10:33:28 +01:00
Vladislav Vaintroub
cd1501a169 some refactoring around readline/libedit
(handle dependent options, allow user with change WITH_READLINE to
WITH_LIBEDIT and other way around after the first compile)
2010-01-08 07:20:43 +01:00
Marc Alff
3d91522561 WL#2360 Performance schema
Part IV: sql instrumentation
2010-01-06 22:42:07 -07:00
Marc Alff
4b559b912f Merge mysql-next-mr (revno 2955) --> mysql-next-mr-marc 2010-01-06 14:26:03 -07:00
Vladislav Vaintroub
6955b7b3da merge 2010-01-06 17:59:59 +00:00
Vladislav Vaintroub
0fe9b8b35e Fix version string parsing 2010-01-07 02:58:55 +01:00
Vladislav Vaintroub
7d97174ce7 remove table formatting (squeeze many spaces into one)
in mysqld--help test.

When mysql is compiled with different options,columns
might have different size (this depends on parameter 
names and some parameters might only be available 
when some option is switched on)
2010-01-06 17:57:10 +00:00
Tor Didriksen
2ac6690200 Follup fix for WL#4738 2010-01-06 16:21:43 +01:00
Guilhem Bichot
341fc0e2c7 Merge with latest next-mr-bugfixing
mysql-test/r/index_merge_myisam.result:
  @@optimizer_switch has a new flag
mysql-test/r/mysqld--help-notwin.result:
  @@optimizer_switch has a new flag
mysql-test/r/mysqld--help-win.result:
  @@optimizer_switch has a new flag
mysql-test/r/optimizer_switch_eng_cond_pushdown1.result:
  Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
mysql-test/r/optimizer_switch_eng_cond_pushdown2.result:
  Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
mysql-test/suite/ndb/r/ndb_gis.result:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
mysql-test/suite/ndb/r/ndb_index_unique.result:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
mysql-test/suite/ndb/t/ndb_gis.test:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
mysql-test/suite/ndb/t/ndb_index_unique.test:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result:
  Setting @@engine_condition_pushdown gives a deprecation warning now.
  We test that the engine_condition_pushdown flag of @@optimizer_switch, and @@engine_condition_pushdown
  influence each other (turning the flag on/off sets the variable on/off and vice-versa).
mysql-test/suite/sys_vars/r/optimizer_switch_basic.result:
  @@optimizer_switch has a new flag
mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test:
  Setting @@engine_condition_pushdown gives a deprecation warning now.
  We test that the engine_condition_pushdown flag of @@optimizer_switch, and @@engine_condition_pushdown
  influence each other (turning the flag on/off sets the variable on/off and vice-versa).
mysql-test/t/optimizer_switch_eng_cond_pushdown1-master.opt:
  Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
mysql-test/t/optimizer_switch_eng_cond_pushdown1.test:
  Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
mysql-test/t/optimizer_switch_eng_cond_pushdown2-master.opt:
  Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
mysql-test/t/optimizer_switch_eng_cond_pushdown2.test:
  Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
sql/mysql_priv.h:
  new "engine_condition_pushdown" switch in @@optimizer_switch, on by default, like
  @@engine_condition_pushdown is on by default. Constants are ULL because optimizer_switch
  is stored in a ulonglong.
sql/mysqld.cc:
  Making --engine-condition-pushdown and --optimizer-switch (command-line options)
  influence each other (last wins)
sql/records.cc:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
sql/sql_select.cc:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
sql/sys_vars.cc:
  Setting @@engine_condition_pushdown now issues a deprecation message. The version for removal
  is unknown at this point so I copied it from other deprecation warnings in this file.
  Turning on/off the engine_condition_pushdown flag of @@optimizer_switch (with SET) turns on/off the @@engine_condition_pushdown variable, and vice-versa, thanks to fix_* functions.
2010-01-06 16:31:11 +01:00
Tor Didriksen
a0f701ec17 Bug #50087 Interval arithmetic for Event_queue_element is not portable.
Subtraction of two unsigned months yielded a (very large) positive value.
Conversion of this to a signed value was not necessarily well defined.

Solution: do the subtraction on signed values.


mysql-test/r/events_scheduling.result:
  Add test case.
mysql-test/t/events_scheduling.test:
  Add test case.
sql/event_data_objects.cc:
  Convert month to signed before doing the subtraction.
2010-01-06 15:00:51 +01:00
Vladislav Vaintroub
400f9587c5 Do not use fvisibility flag if GCC does not support it
(i.e if gcc version < 4)
2010-01-06 12:31:35 +00:00
Guilhem Bichot
ebb8574b7d Fix for BUG#50081 "Tests: mysqld--help-notwin fails with --parallel":
eliminate 3 more "directory path" variables from the test's output (it was already
the case for other similar ones likes slow-query-log-file).
2010-01-06 11:59:01 +01:00
Guilhem Bichot
125cf0d4e8 WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"
"set engine_condition_pushdown" is deprecated, engine condition pushdown is controlled
by a new "set optimizer_switch=engine_condition_pushdown=on|off".

mysql-test/r/index_merge_myisam.result:
  @@optimizer_switch has a new flag
mysql-test/r/mysqld--help-notwin.result:
  @@optimizer_switch has a new flag
mysql-test/r/mysqld--help-win.result:
  @@optimizer_switch has a new flag
mysql-test/r/optimizer_switch_eng_cond_pushdown1.result:
  Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
mysql-test/r/optimizer_switch_eng_cond_pushdown2.result:
  Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
mysql-test/suite/ndb/r/ndb_gis.result:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
mysql-test/suite/ndb/r/ndb_index_unique.result:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
mysql-test/suite/ndb/t/ndb_gis.test:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
mysql-test/suite/ndb/t/ndb_index_unique.test:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result:
  Setting @@engine_condition_pushdown gives a deprecation warning now.
  We test that the engine_condition_pushdown flag of @@optimizer_switch, and @@engine_condition_pushdown
  influence each other (turning the flag on/off sets the variable on/off and vice-versa).
mysql-test/suite/sys_vars/r/optimizer_switch_basic.result:
  @@optimizer_switch has a new flag
mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test:
  Setting @@engine_condition_pushdown gives a deprecation warning now.
  We test that the engine_condition_pushdown flag of @@optimizer_switch, and @@engine_condition_pushdown
  influence each other (turning the flag on/off sets the variable on/off and vice-versa).
mysql-test/t/optimizer_switch_eng_cond_pushdown1-master.opt:
  Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
mysql-test/t/optimizer_switch_eng_cond_pushdown1.test:
  Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
mysql-test/t/optimizer_switch_eng_cond_pushdown2-master.opt:
  Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
mysql-test/t/optimizer_switch_eng_cond_pushdown2.test:
  Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
sql/mysql_priv.h:
  new "engine_condition_pushdown" switch in @@optimizer_switch, on by default, like
  @@engine_condition_pushdown is on by default. Constants are ULL because optimizer_switch
  is stored in a ulonglong.
sql/mysqld.cc:
  Making --engine-condition-pushdown and --optimizer-switch (command-line options)
  influence each other (last wins)
sql/records.cc:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
sql/sql_select.cc:
  @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
sql/sys_vars.cc:
  Setting @@engine_condition_pushdown now issues a deprecation message. The version for removal
  is unknown at this point so I copied it from other deprecation warnings in this file.
  Turning on/off the engine_condition_pushdown flag of @@optimizer_switch (with SET) turns on/off the @@engine_condition_pushdown variable, and vice-versa, thanks to fix_* functions.
2010-01-06 11:54:45 +01:00
Guilhem Bichot
bcd5b9fd61 fixing wrong indentation in two Makefile.am, which prevented the Anjuta IDE from parsing the MySQL tree. 2010-01-06 11:27:35 +01:00
Alexander Nozdrin
f471d82bb5 Merge from bk:ysql-next-mr-bugfixing. 2010-01-06 13:11:57 +03:00
Alexander Nozdrin
9fd33a0663 Merge from mysql-next-mr. 2010-01-06 13:07:02 +03:00
Alexander Nozdrin
3701208a2e Change version tag (to 5.5.99-m3). 2010-01-06 13:02:42 +03:00
Vladislav Vaintroub
9fe3b66936 merge 2010-01-05 22:37:10 +01:00
Vladislav Vaintroub
321cf652cb Fix buggy test that fails due to "error: packets out of order" message in the trace file
when EXTRA_DEBUG is enabled. The reason for the error message is that a query 
was issued with send, but response was not read with reap.
2010-01-05 22:36:08 +01:00
Vladislav Vaintroub
9903564e5c fix white space differences in mysqld--help-notwin.result 2010-01-05 16:30:41 +01:00
Vladislav Vaintroub
401b0bd0be Fix mysqld--help to ignore optional engines 2010-01-05 13:55:58 +01:00
Vladislav Vaintroub
697cfa3fbc Fix the last merge 2010-01-05 02:26:20 +01:00
Vladislav Vaintroub
7db33f809a merge 2010-01-04 23:46:42 +01:00
Jorgen Loland
9b797d06d5 local merge 2010-01-04 10:51:05 +01:00
Jorgen Loland
305f2e7f8a Bug#48920: COUNT DISTINCT returns 1 for NULL values when in a
subquery in the select list
      
When a dependent subquery with count(distinct <col>) was 
evaluated multiple times, the Distinct_Aggregator was reused. 
However, the Aggregator was not reset, so when the subquery was
evaluated for the next record in the outer select, old dependent
info was used.
      
The fix is to clear() the existing aggregator in 
Item_sum::set_aggregator(). This ensures that the aggregator is
reevaluated with the new dependent information.

mysql-test/r/subselect3.result:
  Added test case for BUG#48920
mysql-test/t/subselect3.test:
  Added test case for BUG#48920
sql/item_sum.cc:
  If an aggregator exists when Item_sum::set_aggregator() is
  called (i.e., set_aggregator is called in a dependent
  subquery), the aggregator is reset so that the aggregator is
  reevaluated with the dependent information from the outer
  record being evaluated.
2010-01-04 10:39:42 +01:00
Alexander Nozdrin
cc9007364b Auto-merge from mysql-next-mr. 2010-01-04 12:39:33 +03:00
Alexander Nozdrin
8e1dc83c42 Auto-merge from mysql-next-mr-serg. 2010-01-04 12:34:59 +03:00
Sergei Golubchik
c3ea71896c possible fix for sporadic sys_vars.delayed_insert_limit_func failures 2009-12-31 14:05:33 +01:00