Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1974 05/11/26 05:35:37 kent@stripped +8 -0
Makefile.am:
Distribute "handlerton-win.cc"
mysqld.cc:
Corrected word lenght for some innobase
configuration variables
Makefile.am:
Added Visual Studio 7 project file to EXTRA_DIST
ha_partition.cc, sql_partition.cc:
Changed include to use "..." for Windows
handlerton-win.cc:
Handle engine include/exclude with defines for Windows
new file
sql/Makefile.am
1.123 05/11/26 05:26:19 kent@stripped +1 -1
Distribute "handlerton-win.cc"
sql/set_var.cc
1.149 05/11/26 05:20:46 kent@stripped +4 -2
sql/mysqld.cc
1.493 05/11/26 05:20:23 kent@stripped +8 -4
Corrected word lenght for some innobase
configuration variables
extra/yassl/taocrypt/Makefile.am
1.2 05/11/26 05:19:05 kent@stripped +1 -1
Added Visual Studio 7 project file to EXTRA_DIST
extra/yassl/Makefile.am
1.3 05/11/26 05:19:05 kent@stripped +1 -1
Added Visual Studio 7 project file to EXTRA_DIST
sql/ha_partition.cc
1.12 05/11/26 05:17:12 kent@stripped +1 -1
Changed include to use "..." for Windows
sql/sql_partition.cc
1.15 05/11/26 05:16:18 kent@stripped +1 -1
Changed include to use "..." for Windows
sql/handlerton-win.cc
1.1 05/11/26 00:15:17 kent@stripped +72 -0
Handle engine include/exclude with defines for Windows
sql/handlerton-win.cc
1.0 05/11/26 00:15:17 kent@stripped +0 -0
BitKeeper file /Users/kent/mysql/bk/mysql-5.1-release/sql/handlerton-win.cc
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: kent
# Host: c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root: /Users/kent/mysql/bk/mysql-5.1-release
--- 1.122/sql/Makefile.am 2005-11-23 13:04:05 +01:00
+++ 1.123/sql/Makefile.am 2005-11-26 05:26:19 +01:00
@@ -118,7 +118,7 @@
@DEFS@
BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h
-EXTRA_DIST = udf_example.cc $(BUILT_SOURCES)
+EXTRA_DIST = udf_example.cc handlerton-win.cc $(BUILT_SOURCES)
DISTCLEANFILES = lex_hash.h
AM_YFLAGS = -d
--- 1.492/sql/mysqld.cc 2005-11-23 21:47:27 +01:00
+++ 1.493/sql/mysqld.cc 2005-11-26 05:20:23 +01:00
@@ -356,8 +356,10 @@
extern char *innobase_home, *innobase_tmpdir, *innobase_logdir;
extern long innobase_lock_scan_time;
extern long innobase_mirrored_log_groups, innobase_log_files_in_group;
-extern long innobase_log_file_size, innobase_log_buffer_size;
-extern long innobase_buffer_pool_size, innobase_additional_mem_pool_size;
+extern longlong innobase_log_file_size;
+extern long innobase_log_buffer_size;
+extern longlong innobase_buffer_pool_size;
+extern long innobase_additional_mem_pool_size;
extern long innobase_buffer_pool_awe_mem_mb;
extern long innobase_file_io_threads, innobase_lock_wait_timeout;
extern long innobase_force_recovery;
@@ -7470,8 +7472,10 @@
uint innobase_flush_log_at_trx_commit;
ulong innobase_fast_shutdown;
long innobase_mirrored_log_groups, innobase_log_files_in_group;
-long innobase_log_file_size, innobase_log_buffer_size;
-long innobase_buffer_pool_size, innobase_additional_mem_pool_size;
+longlong innobase_log_file_size;
+long innobase_log_buffer_size;
+longlong innobase_buffer_pool_size;
+long innobase_additional_mem_pool_size;
long innobase_buffer_pool_awe_mem_mb;
long innobase_file_io_threads, innobase_lock_wait_timeout;
long innobase_force_recovery;
--- New file ---
+++ sql/handlerton-win.cc 05/11/26 00:15:17
#include "mysql_priv.h"
extern handlerton heap_hton;
extern handlerton myisam_hton;
extern handlerton myisammrg_hton;
extern handlerton binlog_hton;
#ifdef WITH_INNOBASE_STORAGE_ENGINE
extern handlerton innobase_hton;
#endif
#ifdef WITH_BERKELEY_STORAGE_ENGINE
extern handlerton berkeley_hton;
#endif
#ifdef WITH_EXAMPLE_STORAGE_ENGINE
extern handlerton example_hton;
#endif
#ifdef WITH_ARCHIVE_STORAGE_ENGINE
extern handlerton archive_hton;
#endif
#ifdef WITH_CSV_STORAGE_ENGINE
extern handlerton tina_hton;
#endif
#ifdef WITH_BLACKHOLE_STORAGE_ENGINE
extern handlerton blackhole_hton;
#endif
#ifdef WITH_FEDERATED_STORAGE_ENGINE
extern handlerton federated_hton;
#endif
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
extern handlerton ndbcluster_hton;
#endif
#ifdef WITH_PARTITION_STORAGE_ENGINE
extern handlerton partition_hton;
#endif
/*
This array is used for processing compiled in engines.
*/
handlerton *sys_table_types[]=
{
&heap_hton,
&myisam_hton,
#ifdef WITH_INNOBASE_STORAGE_ENGINE
&innobase_hton,
#endif
#ifdef WITH_BERKELEY_STORAGE_ENGINE
&berkeley_hton,
#endif
#ifdef WITH_EXAMPLE_STORAGE_ENGINE
&example_hton,
#endif
#ifdef WITH_ARCHIVE_STORAGE_ENGINE
&archive_hton,
#endif
#ifdef WITH_CSV_STORAGE_ENGINE
&tina_hton,
#endif
#ifdef WITH_BLACKHOLE_STORAGE_ENGINE
&blackhole_hton,
#endif
#ifdef WITH_FEDERATED_STORAGE_ENGINE
&federated_hton,
#endif
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
&ndbcluster_hton,
#endif
#ifdef WITH_PARTITION_STORAGE_ENGINE
&partition_hton,
#endif
&myisammrg_hton,
&binlog_hton,
NULL
};
--- 1.148/sql/set_var.cc 2005-11-23 21:47:27 +01:00
+++ 1.149/sql/set_var.cc 2005-11-26 05:20:46 +01:00
@@ -70,8 +70,10 @@
extern uint innobase_flush_log_at_trx_commit;
extern ulong innobase_fast_shutdown;
extern long innobase_mirrored_log_groups, innobase_log_files_in_group;
-extern long innobase_log_file_size, innobase_log_buffer_size;
-extern long innobase_buffer_pool_size, innobase_additional_mem_pool_size;
+extern longlong innobase_log_file_size;
+extern long innobase_log_buffer_size;
+extern longlong innobase_buffer_pool_size;
+extern long innobase_additional_mem_pool_size;
extern long innobase_buffer_pool_awe_mem_mb;
extern long innobase_file_io_threads, innobase_lock_wait_timeout;
extern long innobase_force_recovery;
--- 1.11/sql/ha_partition.cc 2005-11-23 21:44:55 +01:00
+++ 1.12/sql/ha_partition.cc 2005-11-26 05:17:12 +01:00
@@ -52,7 +52,7 @@
#pragma implementation // gcc: Class implementation
#endif
-#include <mysql_priv.h>
+#include "mysql_priv.h"
#include "ha_partition.h"
--- 1.14/sql/sql_partition.cc 2005-11-25 09:08:30 +01:00
+++ 1.15/sql/sql_partition.cc 2005-11-26 05:16:18 +01:00
@@ -39,7 +39,7 @@
#include "md5.h"
#ifdef WITH_PARTITION_STORAGE_ENGINE
-#include <ha_partition.h>
+#include "ha_partition.h"
/*
Partition related functions declarations and some static constants;
*/
--- 1.2/extra/yassl/Makefile.am 2005-11-09 10:24:42 +01:00
+++ 1.3/extra/yassl/Makefile.am 2005-11-26 05:19:05 +01:00
@@ -1,2 +1,2 @@
SUBDIRS = taocrypt src
-EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp)
+EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp)
--- 1.1/extra/yassl/taocrypt/Makefile.am 2005-04-28 15:23:12 +02:00
+++ 1.2/extra/yassl/taocrypt/Makefile.am 2005-11-26 05:19:05 +01:00
@@ -1,2 +1,2 @@
SUBDIRS = src
-EXTRA_DIST = taocrypt.dsw taocrypt.dsp
+EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj
| Thread |
|---|
| • bk commit into 5.1 tree (kent:1.1974) | kent | 26 Nov |
