MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Olav Sandstaa Date:January 13 2009 10:39am
Subject:bzr push into mysql-6.0-falcon-team branch (olav:2956)
View as plain text  
 2956 Olav Sandstaa	2009-01-13 [merge]
      Merge, just ignore.
removed:
  mysql-test/t/rpl_slave_exec_mode_basic.test
added:
  config/ac-macros/libmemcached.m4
  config/ac-macros/search_for_lib.m4
  mysql-test/r/innodb_bug34053.result
  mysql-test/t/innodb_bug34053.test
  mysql-test/t/rpl_slave_exec_mode_basic.test
modified:
  BUILD/compile-dist
  BUILD/compile-pentium-gcov
  BUILD/compile-solaris-amd64
  Makefile.am
  client/mysqltest.c
  configure.in
  libmysqld/examples/test-run
  mysql-test/create-test-result
  mysql-test/include/restart_mysqld.inc
  mysql-test/mysql-test-run.pl
  mysql-test/r/func_math.result
  mysql-test/r/group_by.result
  mysql-test/r/subselect.result
  mysql-test/r/subselect2.result
  mysql-test/r/subselect3.result
  mysql-test/r/subselect3_jcl6.result
  mysql-test/r/subselect_mat.result
  mysql-test/r/subselect_no_mat.result
  mysql-test/r/subselect_no_opts.result
  mysql-test/r/subselect_no_semijoin.result
  mysql-test/r/subselect_sj.result
  mysql-test/r/subselect_sj2.result
  mysql-test/r/subselect_sj2_jcl6.result
  mysql-test/r/subselect_sj_jcl6.result
  mysql-test/r/type_varchar.result
  mysql-test/suite/falcon/r/falcon_bug_32833.result
  mysql-test/suite/falcon/t/disabled.def
  mysql-test/suite/falcon/t/falcon_bug.template
  mysql-test/suite/falcon/t/falcon_bug_22180.test
  mysql-test/suite/falcon/t/falcon_bug_23689.test
  mysql-test/suite/falcon/t/falcon_bug_24511.test
  mysql-test/suite/falcon/t/falcon_bug_24858.test
  mysql-test/suite/falcon/t/falcon_bug_24921.test
  mysql-test/suite/falcon/t/falcon_bug_25555.test
  mysql-test/suite/falcon/t/falcon_bug_26057.test
  mysql-test/suite/falcon/t/falcon_bug_27697.test
  mysql-test/suite/falcon/t/falcon_bug_30480_A.test
  mysql-test/suite/falcon/t/falcon_bug_30480_B.test
  mysql-test/suite/falcon/t/falcon_bug_32833.test
  mysql-test/suite/falcon/t/falcon_bug_38304.test
  mysql-test/suite/falcon/t/falcon_bug_39708.test
  mysql-test/suite/falcon/t/falcon_bugs.test
  mysql-test/suite/falcon/t/falcon_bugs2.test
  mysql-test/suite/falcon/t/falcon_select.test
  mysql-test/suite/falcon/t/falcon_unicode-big.test
  mysql-test/suite/falcon_team/t/falcon_bug_34174.test
  mysql-test/t/func_math.test
  mysql-test/t/partition_not_windows.test
  mysql-test/t/subselect.test
  mysql-test/t/subselect3.test
  mysql-test/t/subselect_mat.test
  netware/BUILD/nwbootstrap
  scripts/make_win_bin_dist
  sql/CMakeLists.txt
  sql/handler.h
  sql/item_cmpfunc.h
  sql/item_func.cc
  sql/item_subselect.cc
  sql/item_subselect.h
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/opt_range.cc
  sql/opt_range.h
  sql/records.h
  sql/sql_base.cc
  sql/sql_class.h
  sql/sql_join_cache.cc
  sql/sql_lex.h
  sql/sql_select.cc
  sql/sql_select.h
  sql/sql_test.cc
  sql/sql_union.cc
  sql/table.h
  storage/archive/support/archive_read_test.slap
  storage/falcon/Database.cpp
  storage/falcon/Database.h
  storage/falcon/Interlock.h
  storage/falcon/MemMgr.cpp
  storage/falcon/MemMgr.h
  storage/falcon/Record.cpp
  storage/falcon/Record.h
  storage/falcon/RecordGroup.cpp
  storage/falcon/RecordGroup.h
  storage/falcon/RecordLeaf.cpp
  storage/falcon/RecordLeaf.h
  storage/falcon/RecordScavenge.cpp
  storage/falcon/RecordScavenge.h
  storage/falcon/RecordSection.cpp
  storage/falcon/RecordSection.h
  storage/falcon/RecordVersion.cpp
  storage/falcon/RecordVersion.h
  storage/falcon/Scavenger.cpp
  storage/falcon/StorageDatabase.cpp
  storage/falcon/StorageDatabase.h
  storage/falcon/StorageTableShare.cpp
  storage/falcon/SyncObject.cpp
  storage/falcon/SyncObject.h
  storage/falcon/Table.cpp
  storage/falcon/Table.h
  storage/falcon/TableSpaceManager.cpp
  storage/falcon/Transaction.cpp
  storage/falcon/Transaction.h
  storage/falcon/TransactionManager.cpp
  storage/falcon/TransactionManager.h
  storage/innobase/pars/make_bison.sh
  storage/innobase/pars/make_flex.sh
  storage/maria/ma_test_big.sh
  storage/myisam/mi_test_all.sh
  storage/myisam/myisam_backup_engine.cc
  storage/ndb/demos/run_demo1-PS.sh
  storage/ndb/demos/run_demo1-SS.sh
  support-files/my-small.cnf.sh
  support-files/mysql.spec.sh

=== modified file 'storage/falcon/ha_falcon.cpp'

=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2008-12-19 10:47:17 +0000
+++ b/storage/falcon/ha_falcon.cpp	2009-01-12 12:32:01 +0000
@@ -3091,7 +3091,7 @@
 				case MYSQL_TYPE_TIMESTAMP:
 					{
 					int value = (int) (dataStream->value.integer64 / 1000);
-					longstore(field->ptr, value);
+					((Field_timestamp*)field)->store_timestamp(value);
 					}
 					break;
 

Thread
bzr push into mysql-6.0-falcon-team branch (olav:2956) Olav Sandstaa13 Jan