Commit d898972d authored by unknown's avatar unknown
Browse files

manual merge 


BitKeeper/etc/ignore:
  auto-union
libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/events.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged
parents 40a614ed 7daf362e

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ libmysqld/event.cc 
libmysqld/event_executor.cc

libmysqld/event_scheduler.cc

libmysqld/event_timed.cc

libmysqld/events.cc

libmysqld/examples/client_test.c

libmysqld/examples/client_test.cc

libmysqld/examples/completion_hash.cc

include/my_time.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ enum interval_type 
  INTERVAL_YEAR_MONTH, INTERVAL_DAY_HOUR, INTERVAL_DAY_MINUTE,

  INTERVAL_DAY_SECOND, INTERVAL_HOUR_MINUTE, INTERVAL_HOUR_SECOND,

  INTERVAL_MINUTE_SECOND, INTERVAL_DAY_MICROSECOND, INTERVAL_HOUR_MICROSECOND,

  INTERVAL_MINUTE_MICROSECOND, INTERVAL_SECOND_MICROSECOND

  INTERVAL_MINUTE_MICROSECOND, INTERVAL_SECOND_MICROSECOND, INTERVAL_LAST

};



C_MODE_END

libmysqld/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc 
            ../libmysql/libmysql.c ../sql/password.c ../sql-common/client.c

            ../sql-common/my_time.c ../sql-common/my_user.c

            ../sql-common/pack.c ../sql/derror.cc ../sql/event_executor.cc

            ../sql/event_timed.cc ../sql/event.cc ../sql/discover.cc

            ../sql/event_timed.cc ../sql/events.cc ../sql/discover.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}

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \

	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \

	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \

	event_scheduler.cc event.cc event_timed.cc \

	event_scheduler.cc events.cc event_timed.cc \

	rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \

	sql_tablespace.cc \

	rpl_injector.cc my_user.c partition_info.cc

sql/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc 
               sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc 

               time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc 

               rpl_tblmap.cc sql_binlog.cc event_scheduler.cc event_timed.cc 

               sql_tablespace.cc event.cc ../sql-common/my_user.c 

               sql_tablespace.cc events.cc ../sql-common/my_user.c 

               partition_info.cc

               ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc

  			   ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h