Commit 06ec1190 authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-kt 

into  big_geek.:C:/Work/mysql/mysql-5.1
parents 9ac6fc46 f0878a04

libmysqld/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc 
            ../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc

            ../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc

            ../sql/ha_myisammrg.cc ${mysql_se_ha_src}

            ../sql/handler.cc ../sql/handlerton-win.cc ../sql/hash_filo.cc

            ../sql/handler.cc ../sql/hash_filo.cc

            ../sql/hostname.cc ../sql/init.cc ../sql/item_buff.cc

            ../sql/item_cmpfunc.cc ../sql/item.cc ../sql/item_create.cc

            ../sql/item_func.cc ../sql/item_geofunc.cc ../sql/item_row.cc

mysql-test/r/archive.result

+1 −1
Original line number Diff line number Diff line 
drop table if exists t1,t2;

drop table if exists t1,t2,t3;

CREATE TABLE t1 (

Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,

Varor_period smallint(4) unsigned DEFAULT '0' NOT NULL

mysql-test/t/archive.test

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
-- source include/have_archive.inc



--disable_warnings

drop table if exists t1,t2;

drop table if exists t1,t2,t3;

--enable_warnings



CREATE TABLE t1 (