bk commit into 5.1 tree (tomas:1.2790)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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@stripped, 2007-12-13 14:31:13+01:00, tomas@stripped +3 -0
  change sql_allow_batching -> transaction_allow_batching

  mysql-test/suite/ndb/r/ndb_sql_allow_batching.result@stripped, 2007-12-13 14:31:10+01:00,
tomas@stripped +3 -3
    change sql_allow_batching -> transaction_allow_batching

  mysql-test/suite/ndb/t/ndb_sql_allow_batching.test@stripped, 2007-12-13 14:31:10+01:00,
tomas@stripped +3 -3
    change sql_allow_batching -> transaction_allow_batching

  sql/set_var.cc@stripped, 2007-12-13 14:31:10+01:00, tomas@stripped +4 -3
    change sql_allow_batching -> transaction_allow_batching

diff -Nrup a/mysql-test/suite/ndb/r/ndb_sql_allow_batching.result
b/mysql-test/suite/ndb/r/ndb_sql_allow_batching.result
--- a/mysql-test/suite/ndb/r/ndb_sql_allow_batching.result	2007-12-13 11:30:38 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_sql_allow_batching.result	2007-12-13 14:31:10 +01:00
@@ -4,7 +4,7 @@ create table t2 (a int key, b int) engin
 insert into t1 values (0,0),(1,1),(2,2);
 insert into t2 select * from t1;
 begin;
-set sql_allow_batching=1;
+set transaction_allow_batching=1;
 update t1 set b=0 where a=2;
 commit;
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
@@ -18,7 +18,7 @@ a	b
 With batching only 1 roundtrip
 
 begin;
-set sql_allow_batching=1;
+set transaction_allow_batching=1;
 insert into t1 values (10,10);
 insert into t2 values (10,10);
 commit;
@@ -34,7 +34,7 @@ a	b
 Without batching only 3 roundtrips
 
 begin;
-set sql_allow_batching=0;
+set transaction_allow_batching=0;
 insert into t1 values (11,11);
 insert into t2 values (11,11);
 commit;
diff -Nrup a/mysql-test/suite/ndb/t/ndb_sql_allow_batching.test
b/mysql-test/suite/ndb/t/ndb_sql_allow_batching.test
--- a/mysql-test/suite/ndb/t/ndb_sql_allow_batching.test	2007-12-13 11:30:38 +01:00
+++ b/mysql-test/suite/ndb/t/ndb_sql_allow_batching.test	2007-12-13 14:31:10 +01:00
@@ -12,7 +12,7 @@ insert into t2 select * from t1;
 
 --source include/ndb_init_execute_count.inc
 begin;
-set sql_allow_batching=1;
+set transaction_allow_batching=1;
 update t1 set b=0 where a=2;
 commit;
 --source include/ndb_execute_count.inc
@@ -23,7 +23,7 @@ select * from t1 order by a;
 --echo
 --source include/ndb_init_execute_count.inc
 begin;
-set sql_allow_batching=1;
+set transaction_allow_batching=1;
 insert into t1 values (10,10);
 insert into t2 values (10,10);
 commit;
@@ -35,7 +35,7 @@ select * from t1 order by a;
 --echo
 --source include/ndb_init_execute_count.inc
 begin;
-set sql_allow_batching=0;
+set transaction_allow_batching=0;
 insert into t1 values (11,11);
 insert into t2 values (11,11);
 commit;
diff -Nrup a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc	2007-12-13 11:30:38 +01:00
+++ b/sql/set_var.cc	2007-12-13 14:31:10 +01:00
@@ -565,9 +565,10 @@ static sys_var_thd_bit	sys_log_binlog(&v
                                        check_log_update,
 				       set_option_bit,
 				       OPTION_BIN_LOG);
-static sys_var_thd_bit	sys_sql_allow_batchine(&vars, "sql_allow_batching", 0,
-                                               set_option_bit,
-                                               OPTION_ALLOW_BATCH);
+static sys_var_thd_bit
+sys_transaction_allow_batchine(&vars, "transaction_allow_batching", 0,
+                               set_option_bit,
+                               OPTION_ALLOW_BATCH);
 static sys_var_thd_bit	sys_sql_warnings(&vars, "sql_warnings", 0,
 					 set_option_bit,
 					 OPTION_WARNINGS);