Commit graph

74354 commits

Author SHA1 Message Date
Alexey Botchkov
de3cdcfac4 mdev57 5.5 main.file_contents fails on debian5-i386-fulltest.
The line in the file_contents.test removes all the '/lib' substrings from the
path, so file cannot be found if a path contains such a substring.
As i didn't find where it is needed, the line was just removed

per-file comments:
  mysql-test/t/file_contents.test
mdev57 5.5 main.file_contents fails on debian5-i386-fulltest.
        no '/lib' substring cutting.
2012-01-28 13:52:26 +04:00
unknown
9c922f485c Fix main.openssl_1 failures for -DWITH_SSL=system build.
In 5.5, ssl_do() no longer calls report_errors() in case of ssl error.
Since report_errors() iterated over the list of errors, this means that we
now report the first error in the list, rather than the last. Adjust the
--replace_regex line for OpenSSL build accordingly in the test case.
2012-01-27 15:13:38 +01:00
unknown
595cbf0927 Revert some earlier changes to my.cnf and mariadb.cnf.
I want to avoid that upgrades silently change important config parameters
that users have come to rely on. This could happen if users changed their
my.cnf themselves, and then an upgrade introduces mariadb.cnf which silently
overrides the settings in my.cnf. Avoid this by having mariadb.cnf mostly
empty for now, and in the future we can add just new mariadb-specific
options there that do not break existing installations.
2012-01-27 12:14:41 +01:00
unknown
b0a17a2fb3 Fixed tests consumed big amount of disk space to be "BIG". 2012-01-27 10:58:59 +02:00
Vladislav Vaintroub
aa3a0d3964 merge 2012-01-27 00:57:38 +01:00
Vladislav Vaintroub
9be84d834d fix result file 2012-01-27 00:37:10 +01:00
Vladislav Vaintroub
1c461d91f7 fix embedded build 2012-01-26 20:07:25 +01:00
Vladislav Vaintroub
2551e1ae33 yet another attempt to fix rpl_corruption test 2012-01-26 17:10:30 +01:00
Vladislav Vaintroub
7b3469862c Fix a few failing tests on win2008r2-vs2010-amd64-debug 2012-01-26 16:55:40 +01:00
Vladislav Vaintroub
66a64adb3e Xtradb recently started to access thd members directly ,e.g thd->stmt_da (ha_innodb.cc)
It needs recompilation for embedded server, as layout of THD is different in embedded.
2012-01-26 16:06:08 +01:00
unknown
438ed0408c .deb packaging fixes: make mariadb-common a real package, which depends on
mysql-common and places mariadb-specific stuff in /etc/mysql/conf.d/mariadb.cnf.
This should allow to co-exist with default Debian mysql-common package and
help resolve dependencies when installing mariadb among multiple available
versions of MySQL from different repositories.
2012-01-26 12:55:12 +01:00
unknown
6f142ee51c Remove --plugin-dir option from mysql_client_test test case.
This gives the wrong path when testing installed server, and we
set the correct path in my.cnf anyway.
2012-01-26 13:38:42 +01:00
Vladislav Vaintroub
7ffa6f4d06 Always define UT_DBG_ABORT in innodb/xtradb, also on Windows. This will avoid endless hangs inside ut_dgb_stop_thread 2012-01-25 21:23:14 +01:00
unknown
cff7a9861a Add missing include and library files to libmariadbclient-dev package. 2012-01-25 13:39:54 +01:00
Michael Widenius
2aab4d66c6 Automatic merge 2012-01-25 09:43:41 +02:00
Michael Widenius
59f5c05a38 Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO";
Don't log updates to performance schema in replication log.
Ensure that we don't call ha_update after ha_index_or_rnd_end() is called on slave.


.bzrignore:
  Ignore some generated files
mysql-test/include/show_slave_status.inc:
  Ensure that ./ is removed from file names
mysql-test/suite/perfschema/r/binlog_mix.result:
  Updated results
mysql-test/suite/perfschema/r/binlog_row.result:
  Updated results
mysql-test/suite/perfschema/r/binlog_stmt.result:
  Updated results
mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result:
  Updated results
mysql-test/suite/rpl/r/rpl_performance_schema.result:
  Ensure that we don't crash slave when we update performance schema
mysql-test/suite/rpl/t/rpl_performance_schema.test:
  Ensure that we don't crash slave when we update performance schema
sql/log_event.cc:
  Ensure that we don't call ha_update after ha_index_or_rnd_end() is called.
  Remove old code that is not needed anymore (like restarting read loop over all rows if no matcing row is found)
  Simplify code
sql/log_event_old.cc:
  Ensure that we don't call ha_update after ha_index_or_rnd_end() is called.
storage/myisam/ha_myisam.cc:
  More DBUG_PRINT
storage/perfschema/ha_perfschema.h:
  Don't log updates to performance schema in replication log.
2012-01-24 18:07:35 +02:00
unknown
3b85e2b57c More 5.5 .deb packaging fixes 2012-01-24 14:52:43 +01:00
unknown
92bd8a5c60 More small 5.5 .deb packaging fixes found in Buildbot tests. 2012-01-24 12:27:44 +01:00
unknown
45b512b5b5 Fix two .deb problems causing build/install failures in Buildbot. 2012-01-24 10:47:57 +01:00
Vladislav Vaintroub
19d13a3b17 portability fixes for FreeBSD 8 and 9 2012-01-23 17:12:25 +01:00
unknown
7baa64fc61 Fix typo in Ubuntu .deb packaging 2012-01-23 17:07:01 +01:00
unknown
aa2a2f83e3 Buildbot VMs have cmake in /usr/local/, so we need to include that in the path. 2012-01-23 15:08:46 +01:00
unknown
cfd4fcb0bc Initial draft for building .deb packages for MariaDB 5.5. 2012-01-23 12:20:16 +01:00
Vladislav Vaintroub
3cb24fff33 - Always compile my_new.cc and safemalloc.c with mysys
Preprocessor macros USE_MYSYS_NEW and -DSAFEMALLOC are 
used to conditionally compile safemalloc or overwritten new/delete.

-Define dummy symbol in my_new.cc in case -DUSE_MYSYS_NEW is not set.
This avoids compiler/linker warnings about an essentially empty file
being compiled.
2012-01-20 22:32:31 +01:00
Vladislav Vaintroub
c232b20232 Fix embedded build on Windows. 2012-01-20 16:54:35 +01:00
Vladislav Vaintroub
2ed40859c4 Remove debug output 2012-01-20 12:39:06 +01:00
Vladislav Vaintroub
74cac79218 - Fix rpl_checksum test. Use basename of file in error messages, not the o
nes prefixed with .\ or ./
- Add my_basename() to mysys.
- Do not compile files that are not needed on Windows (my_addr_resolve, an
d safemalloc related stuff it it is not used)
Avoids linker warnings about compilation of essentially empty files.
2012-01-20 01:57:58 +01:00
Vladislav Vaintroub
139bf5ce4c MDEV-103: 'debug' is disabled in this build warnings causes tests to fail
The root cause is that after recent fixes around --debug variable (lp:909051)
the variable is now available in both release and debug builds, such that MTR
cannot tell a debug compiled server from optimized one.

To fix, assign a special default value 'disabled' for 'debug' variable in optimized build
and fix MTR to check for this special value to recognize optimized build.
2012-01-20 01:57:34 +01:00
Vladislav Vaintroub
4502f3b93f disable character_sets_dir_basic - slashes vs backslashes problem is not possible to resolve 2012-01-19 18:41:56 +01:00
Vladislav Vaintroub
3482963ad6 fix broken result file 2012-01-19 17:44:22 +01:00
Vladislav Vaintroub
607c9a6c68 Fix innodb_bug60229 (get the innodb change into xtradb) 2012-01-19 17:31:07 +01:00
Sergei Golubchik
e3e15687a0 update the test result 2012-01-19 14:12:16 +01:00
Sergei Golubchik
309ca7b447 fix the linking failure on windows 2012-01-18 22:09:20 +01:00
Igor Babaev
e041331c89 Merge 2012-01-18 00:38:13 -08:00
Igor Babaev
4fa282db2b Fixed the failure of sp.test reported in the issue MDEV-86. 2012-01-17 23:42:49 -08:00
Sergei Golubchik
4cd19779c7 MDEV-69 SET optimizer_switch = REPLACE(...) causes ER_WRONG_VALUE_FOR_VAR
find_set() in typelib.c expected a zero-terminated string

include/typelib.h:
  disable unused flags
2012-01-17 10:55:27 +01:00
Sergei Golubchik
1433621c14 fixes for non-debug builds (CMAKE_BUILD_TYPE=Release or RelWithDebInfo)
client/CMakeLists.txt:
  1. -rdynamic is a linker flag.
  2. it should be used in all builds, not debug only
libmysql/get_password.c:
  prefer a standard function, when possible
  (otherwise a plugin will need to load it from the client)
2012-01-17 09:11:20 +01:00
Sergei Golubchik
8b278b4415 merge 2012-01-16 21:13:05 +01:00
Sergei Golubchik
8d13f97084 remove unused flag 2012-01-16 21:06:44 +01:00
Sergei Golubchik
2ec0f46b88 query cache sysvar fixes
sql/share/errmsg-utf8.txt:
  correct the error message, as query_cache_type variable is not read-ony anymore
sql/sql_cache.cc:
  the caller should verify that query cache resize
  is possible, before trying it
sql/sys_vars.cc:
  * test if qc resize is possible in the sysvar on_check() funntion,
    not in the on_update() function.
  * use the error message that better describes the problem
2012-01-16 21:06:23 +01:00
Sergei Golubchik
baca1a40e9 enable test cases for bugs fixed in xtradb.
disable test cases for bugs not fixed in xtradb.

mysql-test/suite/innodb/t/innodb-lock.test:
  instead of disabling the test in disabled.def
  (hoping that somebody someday will enable it),
  skip it only for xtradb (not for innodb), and
  only for the current xtradb version. the test
  will enable itself automatically on the next
  xtradb merge
mysql-test/suite/innodb/t/innodb_cmp_drop_table.test:
  instead of disabling the test in disabled.def
  (hoping that somebody someday will enable it),
  skip it only for xtradb (not for innodb), and
  only for the current xtradb version. the test
  will enable itself automatically on the next
  xtradb merge
mysql-test/suite/innodb/t/innodb_corrupt_bit.test:
  fix the error number
storage/innobase/handler/ha_innodb.cc:
  fix the error number
storage/xtradb/handler/ha_innodb.cc:
  fix the error number
2012-01-16 21:02:43 +01:00
Sergei Golubchik
0c07546175 minor mtr fix
mysql-test/mysql-test-run.pl:
  strace-client does not take an argument
2012-01-16 20:58:00 +01:00
Sergei Golubchik
38e3ae155d mysql-5.5 merge 2012-01-16 20:16:35 +01:00
Sergei Golubchik
c56483d972 remove duplicate .opt with AUTH_PLUGIN_SO 2012-01-13 15:52:19 +01:00
Sergei Golubchik
4f435bddfd 5.3 merge 2012-01-13 15:50:02 +01:00
Sergei Golubchik
6ca4ca7d37 multi-delete should ignore semi-join internal temp tables,
when looking for tables to delete from
2012-01-13 13:54:55 +01:00
Sergei Golubchik
45e25e3643 lp:893522 more problems found by PVS Studio 2012-01-12 20:23:02 +01:00
Vladislav Vaintroub
44c8745ff5 MDEV-85: Remove shared plugin library if build swtiches from shared to static with
e.g 
cmake . -DWITH_XXXX_STORAGE_ENGINE=1
2012-01-11 13:35:27 +01:00
unknown
296b450d3b Fix the comment. 2012-01-11 10:35:16 +02:00
unknown
db7acaa475 fix for 64bit windows
fix misleading test name
2012-01-11 10:26:35 +02:00