Merge with 4.1.3-beta

1 files changed, 11 insertions, 0 deletions

diff --git a/.bzrignore b/.bzrignore
index 08ef076d278..e653a6f4343 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -272,11 +272,13 @@ emacs.h
 extra/comp_err
 extra/my_print_defaults
 extra/mysql_install
+extra/mysql_tzinfo_to_sql
 extra/mysql_waitpid
 extra/perror
 extra/replace
 extra/resolve_stack_dump
 extra/resolveip
+extra/tztime.cc
 fcns.c
 fcns.h
 gmon.out
@@ -316,6 +318,7 @@ isam/test3
 libmysql/*.c
 libmysql/conf_to_src
 libmysql/my_static.h
+libmysql/my_time.c
 libmysql/mysys_priv.h
 libmysql/net.c
 libmysql/vio_priv.h
@@ -382,6 +385,7 @@ libmysqld/log_event.cc
 libmysqld/md5.c
 libmysqld/mf_iocache.cc
 libmysqld/mini_client.cc
+libmysqld/my_time.c
 libmysqld/net_pkg.cc
 libmysqld/net_serv.cc
 libmysqld/opt_ft.cc
@@ -443,6 +447,7 @@ libmysqld/strfunc.cc
 libmysqld/table.cc
 libmysqld/thr_malloc.cc
 libmysqld/time.cc
+libmysqld/tztime.cc
 libmysqld/uniques.cc
 libmysqld/unireg.cc
 libtool
@@ -496,6 +501,7 @@ mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
 mysql-test/gmon.out
 mysql-test/install_test_db
 mysql-test/mysql-test-run
+mysql-test/ndb/ndbcluster
 mysql-test/r/*.reject
 mysql-test/r/rpl000001.eval
 mysql-test/r/rpl000002.eval
@@ -721,6 +727,10 @@ sql/gen_lex_hash
 sql/gmon.out
 sql/lex_hash.h
 sql/mini_client_errors.c
+sql/my_time.c
+sql/mysql_tzinfo_to_sql
+sql/mysql_tzinfo_to_sql.cc
+sql/mysql_tzinfo_to_sql_tztime.cc
 sql/mysqlbinlog
 sql/mysqld
 sql/mysqld-purecov
@@ -740,6 +750,7 @@ sql/sql_yacc.cc
 sql/sql_yacc.h
 sql/sql_yacc.output
 sql/sql_yacc.yy.orig
+sql/test_time
 sql/udf_example.so
 sql_error.cc
 sql_prepare.cc