1. 16 Oct, 2009 3 commits
    • Alexander Ivanov's avatar
      MWL#36: Add a mysqlbinlog option to change the used database. · ab2fdf78
      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).
      ab2fdf78
    • Alexander Ivanov's avatar
      MWL#36: Add a mysqlbinlog option to change the used database. · f79aed87
      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.
      f79aed87
    • Alexander Ivanov's avatar
      MWL#36: Add a mysqlbinlog option to change the used database. · 324abd68
      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.
      
      324abd68
  2. 06 Oct, 2009 11 commits
  3. 05 Oct, 2009 2 commits
    • unknown's avatar
      MBug#443092: test cases mysql and mysql_upgrade fails with wildcard DNS · 164270bc
      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.
      164270bc
    • unknown's avatar
      MBug#443014: Too many 'skipped' messages in mysql-test-run · 9cbc76b9
      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.
      9cbc76b9
  4. 04 Oct, 2009 1 commit
    • Sergey Petrunya's avatar
      Fix a problem in windows build introduced a few csets ago (in · 52d92de3
      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].
      52d92de3
  5. 03 Oct, 2009 6 commits
  6. 02 Oct, 2009 6 commits
    • unknown's avatar
      Merge Monty's fixes from main into release branch. · 4f835f19
      unknown authored
       - MariaDB naming.
       - Error reporting with mysqld --help --verbose.
      4f835f19
    • unknown's avatar
      Add missing windows files to `make dist`. · 1137e954
      unknown authored
      1137e954
    • Michael Widenius's avatar
      Fixed typo · df26a7a5
      Michael Widenius authored
      df26a7a5
    • Michael Widenius's avatar
      When using --help --verbose give error and abort if there are any unknown options · 1f7cc235
      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
      1f7cc235
    • Michael Widenius's avatar
      Added client functions: · d2b9b326
      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
      d2b9b326
    • unknown's avatar
      Add a simple way to robustly get the name of the generated source tarball, so as to not · e710b778
      unknown authored
      to have to rely on fragile regexp-parsing of configure.in.
      e710b778
  7. 01 Oct, 2009 2 commits
  8. 30 Sep, 2009 4 commits
  9. 29 Sep, 2009 5 commits