List:Commits« Previous MessageNext Message »
From:Petr Chardin Date:January 19 2006 2:25am
Subject:bk commit into 5.1 tree (cps:1.2076)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2076 06/01/19 05:25:49 cps@stripped +10 -0
  wl1019: fix issues, found after the merge

  sql/log.cc
    1.189 06/01/19 05:25:44 cps@stripped +11 -0
    disable binlogging of the log tables

  scripts/mysql_create_system_tables.sh
    1.31 06/01/19 05:25:44 cps@stripped +2 -0
    post-merge fix

  mysql-test/r/information_schema.result
    1.93 06/01/19 05:25:43 cps@stripped +1 -1
    update result

  mysql-test/t/log_tables.test
    1.9 06/01/19 05:25:44 cps@stripped +4 -4
    fix error numbers

  mysql-test/t/im_utils.imtest
    1.3 06/01/19 05:25:44 cps@stripped +0 -7
    remove inlcude: it doesn't work as intended. move it to
    im_check_os.

  mysql-test/t/im_options_unset.imtest
    1.3 06/01/19 05:25:43 cps@stripped +0 -7
    remove inlcude: it doesn't work as intended. move it to
    im_check_os.

  mysql-test/t/im_options_set.imtest
    1.3 06/01/19 05:25:43 cps@stripped +0 -7
    remove inlcude: it doesn't work as intended. move it to
    im_check_os.

  mysql-test/t/im_life_cycle.imtest
    1.4 06/01/19 05:25:43 cps@stripped +0 -7
    remove inlcude: it doesn't work as intended. move it to
    im_check_os.

  mysql-test/t/im_daemon_life_cycle.imtest
    1.3 06/01/19 05:25:43 cps@stripped +0 -7
    remove inlcude: it doesn't work as intended. move it to
    im_check_os.

  mysql-test/include/im_check_os.inc
    1.2 06/01/19 05:25:43 cps@stripped +7 -0
    we should only run im tests if csv is on for now: im relies
    on mysqld options available only in csv build.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cps
# Host:	outpost.site
# Root:	/home/cps/mysql/devel/mysql-5.1-logs-merge

--- 1.188/sql/log.cc	2006-02-05 11:38:03 +03:00
+++ 1.189/sql/log.cc	2006-01-19 05:25:44 +03:00
@@ -316,6 +316,9 @@
   if (unlikely(!logger.is_log_tables_initialized))
     return FALSE;
 
+  /* log table entries are not replicated at the moment */
+  tmp_disable_binlog(current_thd);
+
   general_log_thd->start_time= event_time;
   /* set default value (which is CURRENT_TIMESTAMP) */
   table->field[0]->set_null();
@@ -326,6 +329,9 @@
   table->field[4]->store(command_type, command_type_len, &my_charset_latin1);
   table->field[5]->store(sql_text, sql_text_len, &my_charset_latin1);
   table->file->ha_write_row(table->record[0]);
+
+  reenable_binlog(current_thd);
+
   return FALSE;
 }
 
@@ -374,6 +380,9 @@
   if (unlikely(!logger.is_log_tables_initialized))
     return FALSE;
 
+  /* log table entries are not replicated at the moment */
+  tmp_disable_binlog(current_thd);
+
   /*
      Set start time for CURRENT_TIMESTAMP to the start of the query.
      This will be default value for the field
@@ -430,6 +439,8 @@
 
   /* write the row */
   table->file->ha_write_row(table->record[0]);
+
+  reenable_binlog(current_thd);
 
   DBUG_RETURN(0);
 }

--- 1.1/mysql-test/include/im_check_os.inc	2005-10-01 01:14:35 +04:00
+++ 1.2/mysql-test/include/im_check_os.inc	2006-01-19 05:25:43 +03:00
@@ -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

--- 1.2/mysql-test/t/im_daemon_life_cycle.imtest	2005-12-13 16:18:15 +03:00
+++ 1.3/mysql-test/t/im_daemon_life_cycle.imtest	2006-01-19 05:25:43 +03:00
@@ -6,13 +6,6 @@
 #
 ###########################################################################
 
-# 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
-
 --source include/im_check_os.inc
 
 ###########################################################################

--- 1.3/mysql-test/t/im_life_cycle.imtest	2005-12-13 16:18:15 +03:00
+++ 1.4/mysql-test/t/im_life_cycle.imtest	2006-01-19 05:25:43 +03:00
@@ -6,13 +6,6 @@
 #
 ###########################################################################
 
-# 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
-
 --source include/im_check_os.inc
 
 ###########################################################################

--- 1.2/mysql-test/t/im_options_set.imtest	2005-12-13 16:18:15 +03:00
+++ 1.3/mysql-test/t/im_options_set.imtest	2006-01-19 05:25:43 +03:00
@@ -38,13 +38,6 @@
 
 ###########################################################################
 
-# 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
-
 --source include/im_check_os.inc
 
 ###########################################################################

--- 1.2/mysql-test/t/im_options_unset.imtest	2005-12-13 16:18:15 +03:00
+++ 1.3/mysql-test/t/im_options_unset.imtest	2006-01-19 05:25:43 +03:00
@@ -45,13 +45,6 @@
 
 ###########################################################################
 
-# 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
-
 --source include/im_check_os.inc
 
 ###########################################################################

--- 1.2/mysql-test/t/im_utils.imtest	2005-12-13 16:18:15 +03:00
+++ 1.3/mysql-test/t/im_utils.imtest	2006-01-19 05:25:44 +03:00
@@ -6,13 +6,6 @@
 #
 ###########################################################################
 
-# 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
-
 --source include/im_check_os.inc
 
 ###########################################################################

--- 1.92/mysql-test/r/information_schema.result	2006-02-05 11:20:45 +03:00
+++ 1.93/mysql-test/r/information_schema.result	2006-01-19 05:25:43 +03:00
@@ -734,7 +734,7 @@
 CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
 CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
 count(*)
-107
+109
 drop view a2, a1;
 drop table t_crashme;
 select table_schema,table_name, column_name from

--- 1.8/mysql-test/t/log_tables.test	2006-02-05 10:01:31 +03:00
+++ 1.9/mysql-test/t/log_tables.test	2006-01-19 05:25:44 +03:00
@@ -60,10 +60,10 @@
 # check locking of the log tables
 #
 
---error 1504
+--error 1532
 lock tables mysql.general_log WRITE;
 
---error 1504
+--error 1532
 lock tables mysql.slow_log WRITE;
 
 #
@@ -72,10 +72,10 @@
 # tables are always opened and locked by the logger.
 #
 
---error 1505
+--error 1533
 lock tables mysql.general_log READ;
 
---error 1505
+--error 1533
 lock tables mysql.slow_log READ;
 
 #

--- 1.30/scripts/mysql_create_system_tables.sh	2006-02-05 11:20:45 +03:00
+++ 1.31/scripts/mysql_create_system_tables.sh	2006-01-19 05:25:44 +03:00
@@ -765,6 +765,8 @@
     c_sl="$c_sl CREATE PROCEDURE create_slow_log_table() BEGIN DECLARE is_csv_enabled int DEFAULT 0; SELECT @@have_csv = 'YES' INTO is_csv_enabled; IF (is_csv_enabled) THEN 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_slow_log_table();
 DROP PROCEDURE create_slow_log_table;"
+fi
+
 if test ! -f $mdata/event.frm
 then
   c_ev="$c_ev CREATE TABLE event ("
Thread
bk commit into 5.1 tree (cps:1.2076)Petr Chardin19 Jan