- 16 Oct, 2009 3 commits
-
-
Alexander Ivanov authored
Add Rpl_filter to mysqlbinlog.cc Note. Though within MWL#36 we are going to use only two Rpl_filter's methods (add_db_rewrite and get_rewrite_db), we look forward for MWL#40 where Rpl_filter is likely to be used to its more extent. Note. Within MWL#36 we will not use Rpl_filter for supporting --database option: this option allows to specify only one database what doesn't correlate with Rpl_filter::add_do_db() (using this method will either appear "artificial" or require changing --database semantics). To be discussed within MWL#40. To add Rpl_filter we need: 1. include sql_string.h There are two instances of sql_string.* files - in sql and in client directories. We need to use the ones from the sql dir. 2. include sql_list.h This requires to define a client version of sql_alloc() function. 3. include rpl_filter.h This requires a definition of system_charset_info variable. Besides, Rpl_filter::tables_ok() refers to a TABLE_LIST structure which encounts deep non-client dependencies and can't be used here as is. On the other hand, tables_ok() make use only few TABLE_LIST's members and none of them depends on specific server context. This allows to redefine TABLE_LIST in a client context so that tables_ok() becomes admissible (surely it's a kind of hack but (at least currently) it's better than #ifndef'ing this method in Rpl_filter definition). Also add Rpl_filter::rewrite_db_is_empty() method. This is needed to be able to check that --rewrite-db is not used jointly with --base64-output= always (this is not supported - at least currently).
-
Alexander Ivanov authored
Add rewrite_db() member to the Table_map_log_event class. Each RBR-event in binary log is preceded by a Table_map event containing a (db_id, db_name) pair. The rewrite_db(new_name) function replaces db_name by new_name in a buffer containing Table_map event read from the binary log.
-
Alexander Ivanov authored
Make sql_alloc() declaration "public" for a client context. The reason is that sql_alloc() is used in definition of some common purpose stuff (e.g. sql_list.*). To make this stuff available for a client context we declare sql_alloc() as a "virtual function", i.e. as a function that is already declared but must be defined in this context (note that definition of sql_alloc() in thr_malloc.cc is #ifndef'ed for MYSQL_CLIENT). Also make sql_string.h repeatedly includable.
-
- 06 Oct, 2009 11 commits
-
-
unknown authored
-
unknown authored
-
unknown authored
-
unknown authored
-
Sergey Petrunya authored
- Adjust CMakeLists.txt to follow latest mysql's expectations about plugins - Add typecasts - wrap pbms_enabled.cc in #ifdef
-
unknown authored
-
unknown authored
- innodb-index needs regexp replace for embedded like other similar tests. - partitions_special_* need to be modified for the extension from 16 to 32 max key parts allowed that was made in MariaDB.
-
unknown authored
-
Michael Widenius authored
-
Michael Widenius authored
-
Michael Widenius authored
Don't call _mi_decrement_open_count() for mi_extra(HA_EXTRA_PREPARE_FOR_DROP). This ensures that if we empty the key cache and a drop table fails later, the index will be automaticly rebuilt storage/maria/ma_extra.c: Don't call _ma_decrement_open_count() for ma_extra(HA_EXTRA_PREPARE_FOR_DROP). This ensures that if we empty the key cache and a drop table fails later, the index will be automaticly rebuilt storage/maria/ma_locking.c: Simple optimization: Don't call maria_lock_database() if locking is disabled storage/myisam/mi_extra.c: Don't call _mi_decrement_open_count() for mi_extra(HA_EXTRA_PREPARE_FOR_DROP). Simplify code to remove if
-
- 05 Oct, 2009 2 commits
-
-
unknown authored
When DNS is not working and returns some address even for non-existing host names, some test cases fail with wrong error. Fix by disabling these tests on such systems.
-
unknown authored
Remove mysql-test-run.pl unnecessary and confusing 'skipped' messages. - In mysql-test-run.pl, we auto-generate combinations of replication tests. But this sometimes generates combinations that are meaningless, like running a test that requires row-based replication with statement-based. These superfluous combinationes should not be reported as skipped, they should just be deleted. - Remove ndb suites from default suites, as we do not support NDB in MariaDB. Keep skip messages resulting from running mysql-test-run.pl in special ways, eg. --mysqld=--binlog-format=statement.
-
- 04 Oct, 2009 1 commit
-
-
Sergey Petrunya authored
"Merge Monty's fixes from main into release branch" .. cset): - mysql_get_server_name() is a new client API function and so should be exported from libmysql[d]. libmysql/libmysql.def: mysql_get_server_name() is a new client API function and so should be exported from libmysql[d]. libmysqld/libmysqld.def: mysql_get_server_name() is a new client API function and so should be exported from libmysql[d].
-
- 03 Oct, 2009 6 commits
-
-
unknown authored
- Don't omit the @@debug variable from testcase check, since it can cause real problems. - Fix some bad merges by reverting to be identical to MySQL 5.1. mysql-test/include/mtr_check.sql: Don't omit the @@debug variable from testcase check, since it can cause real problems. mysql-test/r/mysqlbinlog_row_big.result: Fix incorrect merge. mysql-test/r/variables-big.result: Fix incorrect merge, by reverting to MySQL 5.1 version. mysql-test/t/mysqlbinlog_row_big.test: Fix incorrect merge. mysql-test/t/variables-big.test: Fix incorrect merge, by reverting to MySQL 5.1 version.
-
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478unknown authored
storage/maria/ma_blockrec.c: GCC warns about const vs. non-const despite cast (but it is in any case cleaner to avoid the cast completely) support-files/compiler_warnings.supp: Silence a wrong compiler warning caused by GCC bug.
-
Sergey Petrunya authored
'innobase'.
-
unknown authored
Otherwise following tests go crazy in the log, writing gigabytes of data and causing havoc.
-
Sergey Petrunya authored
-
Sergey Petrunya authored
- Don't run testcase for BUG#45632 with embedded server.
-
- 02 Oct, 2009 6 commits
-
-
unknown authored
- MariaDB naming. - Error reporting with mysqld --help --verbose.
-
unknown authored
-
Michael Widenius authored
-
Michael Widenius authored
mysql-test/r/mysqld_option_err.result: Test that mysqld --not-known-option --help --verbose gives error mysql-test/t/mysqld_option_err.test: Test that mysqld --not-known-option --help --verbose gives error
-
Michael Widenius authored
- mysql_get_server_name() This returns MySQL or MariaDB depending on the server type - mariadb_connection() This returns 1 if you are connected to a MariaDB server Modifed the MySQL command line client to print out if you are connected to MariaDB or MySQL Better default prompt (shows server you are connected to and base directory) client/mysql.cc: Print out if you are connected to MariaDB or MySQL Better default prompt (shows server you are connected to and base directory) Added option \N to prompt to print server name. configure.in: Changed maria to MariaDB in version string include/mysql.h: Added mysql_get_server_name() and mariadb_connection() include/mysql.h.pp: Update for new API functions libmysql/libmysql.c: Added client functions: - mysql_get_server_name() This returns MySQL or MariaDB depending on the server type - mariadb_connection() This returns 1 if you are connected to a MariaDB server
-
unknown authored
to have to rely on fragile regexp-parsing of configure.in.
-
- 01 Oct, 2009 2 commits
-
-
Sergey Petrunya authored
server, as it doesn't work there. sql/sql_plugin.cc: Temporary solution: skip PBXT (like we do e.g. for --skip-innodb) in embedded server, as it doesn't work there.
-
Sergey Petrunya authored
-
- 30 Sep, 2009 4 commits
-
-
unknown authored
This allows to eg use --mem or --parallel for better performance on big boxes.
-
unknown authored
Author: Peter Lieverdink
-
unknown authored
Don't ever build it, and don't include it in source tarballs. (we keep the sources in bzr to not get conflicts on every upstream change).
-
unknown authored
This is needed to fix failures seen in Buildbot (main.ctype_gbk_binlog). Problem is that some tests did not RESET MASTER, causing them to pick up random binlog files depending on prior tests.
-
- 29 Sep, 2009 5 commits
-
-
Peter Lieverdink authored
-
Peter Lieverdink authored
-
Peter Lieverdink authored
-
unknown authored
(These are by their nature difficult to test reliably due to differences in timing).
-
unknown authored
Fix trivial typo in BUILD/* scripts. BUILD/SETUP.sh: Fix typo. mysql-test/mysql-test-run.pl: Fix mysql-test-run.pl to be able to find plugins used in testing also when running the test suite from an installed mysqld package.
-