Commit 6337ad6d authored by unknown's avatar unknown
Browse files

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  outpost.site:/home/cps/mysql/devel/mysql-5.1-logs-prepush
parents 40d4fcfc 41536fce

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 '',