Commit 41536fce authored by unknown's avatar unknown
Browse files

WL1019: complete patch. Reapplied patch to the clean 

tree to get rid of multiple typos in CS comments and
unify the patch.


configure.in:
  CSV is compiled in by default now
include/my_base.h:
  add new ha_extra flag for the log tables
mysql-test/include/im_check_os.inc:
  we should only run im tests if csv is on for now: im relies
  on mysqld options available only in csv build.
mysql-test/include/system_db_struct.inc:
  check log tables structure
mysql-test/lib/init_db.sql:
  create log tables when running tests.
mysql-test/mysql-test-run.pl:
  Add old logs flag to IM tests. As IM could only deal with
  old logs (this feature is not needed with log tables)
mysql-test/r/connect.result:
  update result
mysql-test/r/csv.result:
  update result
mysql-test/r/im_utils.result:
  update result
mysql-test/r/information_schema.result:
  update result
mysql-test/r/mysqlcheck.result:
  update result
mysql-test/r/show_check.result:
  update result
mysql-test/r/system_mysql_db.result:
  update result
mysql-test/t/connect.test:
  disable test if CSV engine is not in: result depends on the
  presence of CSV-based log tables
mysql-test/t/csv.test:
  add tests for concurrent insert (the functionality is added
  to CSV in this patch)
mysql-test/t/information_schema.test:
  disable test if CSV engine is not in: result depends on the
  presence of CSV-based log tables
mysql-test/t/mysqlcheck.test:
  disable test if CSV engine is not in: result depends on the
  presence of CSV-based log tables
mysql-test/t/show_check.test:
  disable test if CSV engine is not in: result depends on the
  presence of CSV-based log tables
mysql-test/t/system_mysql_db.test:
  disable test if CSV engine is not in: result depends on the
  presence of CSV-based log tables
mysql-test/t/system_mysql_db_fix.test:
  disable test if CSV engine is not in: result depends on the
  presence of CSV-based log tables
scripts/mysql_create_system_tables.sh:
  new system tables: slow_log and general_log
scripts/mysql_fix_privilege_tables.sql:
  add new log tables: use an SP to create them for
  non-csv build to work fine.
sql/ha_myisam.cc:
  move locking-related checks to the hanlder
sql/ha_myisam.h:
  new function declared
sql/handler.h:
  new virtual function is added: we should check for handler-related
  locking issues in the handler
sql/lock.cc:
  from now on we check for handler-related locking issues
  in the handler itself rather then in lock.cc
sql/log.cc:
  Add log tables support, refactoring: there are log event
  handlers with common interface. They are used by the LOGGER
  class, which is responsible for their initialization, cleanup
  and managment. Logging to the tables provided by one of the
  log event handler types.
sql/log.h:
  declare new log classes
sql/log_event.cc:
  convert old logging routines calls to use new API
sql/mysql_priv.h:
  define common log routines and objects
sql/mysqld.cc:
  Add support for the log tables. Their initalization, cleanup
  and specific options.
sql/share/errmsg.txt:
  add new error messages for the log tables
sql/slave.cc:
  convert old logging routines calls to use new API
sql/sql_base.cc:
  TABLE objects used by the logger should be skipped
  during refreshes (as log tables are always opened
  and locked). fix table_is_used to skip them.  This
  is needed for FLUSH LOGS to work
sql/sql_db.cc:
  convert old logging routines calls to use new API
sql/sql_delete.cc:
  fix TRUNCATE to work with log tables
sql/sql_parse.cc:
  command_name is now an array of LEX_STRINGs
sql/sql_prepare.cc:
  convert old logging routines calls to use new API
sql/sql_show.cc:
  convert old logging routines calls to use new API
sql/sql_table.cc:
  don't reoped the log tables for admin purposes
sql/table.cc:
  mark log tables as such during the open
sql/table.h:
  add log-related info
storage/csv/ha_tina.cc:
  add support for concurrent insert (see bk commit - 5.1 tree
  (petr:1.1910) for standalone patch), add log tables-specific
  csv table handling.
storage/csv/ha_tina.h:
  enable concurrent insert for CSV, add log table flag
mysql-test/r/log_tables.result:
  New BitKeeper file ``mysql-test/r/log_tables.result''
mysql-test/t/log_tables.test:
  New BitKeeper file ``mysql-test/t/log_tables.test''
parent 471314df

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -2437,7 +2437,8 @@ MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive,, 
 \$(top_builddir)/storage/archive/libarchive.a, [

  AC_CONFIG_FILES(storage/archive/Makefile)

])

MYSQL_STORAGE_ENGINE(csv,,,,,no,storage/csv,,,[

MYSQL_STORAGE_ENGINE(csv,,,"yes",,tina_hton,storage/csv,

  ../storage/csv/ha_tina.o,,[

  AC_CONFIG_FILES(storage/csv/Makefile)

])

MYSQL_STORAGE_ENGINE(blackhole)

include/my_base.h

+7 −2
Original line number Diff line number Diff line
@@ -161,7 +161,12 @@ enum ha_extra_function { 
    handling on the slave

  */

  HA_EXTRA_IGNORE_NO_KEY,

  HA_EXTRA_NO_IGNORE_NO_KEY

  HA_EXTRA_NO_IGNORE_NO_KEY,

  /*

    Mark the table as a log table. For some handlers (e.g. CSV) this results

    in a special locking for the table.

  */

  HA_EXTRA_MARK_AS_LOG_TABLE

};



	/* The following is parameter to ha_panic() */

mysql-test/include/im_check_os.inc

+7 −0
Original line number Diff line number Diff line
@@ -3,5 +3,12 @@ 


--source include/not_windows.inc



# check that CSV engine was compiled in, as IM the test suite uses

# logs tables-specific option and the option is not present if CSV

# (and => the log tables) are not in.

# NOTE: In future we should remove this check and make the test suite

# to pass correct opyions to IM depending on the CSV presence

--source include/have_csv.inc



--connection default

--disconnect dflt_server_con

mysql-test/include/system_db_struct.inc

+2 −0
Original line number Diff line number Diff line
@@ -13,3 +13,5 @@ show create table columns_priv; 
show create table procs_priv;

show create table proc;

show create table event;

show create table general_log;

show create table slow_log;

mysql-test/lib/init_db.sql

+4 −0
Original line number Diff line number Diff line
@@ -570,6 +570,10 @@ CREATE TABLE proc ( 
) character set utf8 comment='Stored Procedures';





CREATE PROCEDURE create_log_tables() BEGIN DECLARE is_csv_enabled int DEFAULT 0; SELECT @@have_csv = 'YES' INTO is_csv_enabled; IF (is_csv_enabled) THEN CREATE TABLE general_log (event_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT, thread_id INTEGER, server_id INTEGER, command_type VARCHAR(64), argument MEDIUMTEXT) engine=CSV CHARACTER SET utf8 comment='General log'; CREATE TABLE slow_log (start_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, query_time TIME NOT NULL, lock_time TIME NOT NULL, rows_sent INTEGER NOT NULL, rows_examined INTEGER NOT NULL, db VARCHAR(512), last_insert_id INTEGER, insert_id INTEGER, server_id INTEGER, sql_text MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment='Slow log'; END IF; END;

CALL create_log_tables();

DROP PROCEDURE create_log_tables;



CREATE TABLE event (

  db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',

  name char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',