summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorunknown <malff@lambda.hsd1.co.comcast.net.>2007-10-18 16:39:55 -0600
committerunknown <malff@lambda.hsd1.co.comcast.net.>2007-10-18 16:39:55 -0600
commitd927461052084fc876151c42ea9502b5bf3fef4a (patch)
treeccfb662d95d2a05ae770fc63803f610a589db2d8 /sql/set_var.cc
parenta634d1bf474aab88c44d448035b6a9a35d6e795d (diff)
parent367fc73e3cf8825bdf46ac4c277afe7097652e39 (diff)
downloadmariadb-git-d927461052084fc876151c42ea9502b5bf3fef4a.tar.gz
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge mysql-test/r/udf.result: Auto merged mysql-test/t/udf.test: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/udf_example.c: Auto merged sql/udf_example.def: Auto merged
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 2c961868bba..2ba6662a2c5 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -784,7 +784,6 @@ sys_var *sys_variables[]=
&sys_innodb_max_purge_lag,
&sys_innodb_table_locks,
&sys_innodb_support_xa,
- &sys_innodb_max_purge_lag,
&sys_innodb_autoextend_increment,
&sys_innodb_sync_spin_loops,
&sys_innodb_concurrency_tickets,