| List: | Commits | « Previous MessageNext Message » | |
| From: | msvensson | Date: | November 27 2006 10:49am |
| Subject: | bk commit into 5.1 tree (msvensson:1.2391) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 repository of msvensson. When msvensson 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@stripped, 2006-11-27 10:48:41+01:00, msvensson@neptunus.(none) +16 -0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint MERGE: 1.1810.2319.15 BitKeeper/deleted/.del-CMakeLists.txt~14@stripped, 2006-11-27 10:45:01+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.1.1.2 BitKeeper/deleted/.del-CMakeLists.txt~14@stripped, 2006-11-27 10:45:01+01:00, msvensson@neptunus.(none) +0 -0 Merge rename: mysys/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~14 BitKeeper/deleted/.del-CMakeLists.txt~7@stripped, 2006-11-27 10:45:02+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.1.2.2 BitKeeper/deleted/.del-CMakeLists.txt~7@stripped, 2006-11-27 10:45:01+01:00, msvensson@neptunus.(none) +0 -0 Merge rename: client/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~7 client/Makefile.am@stripped, 2006-11-27 10:48:33+01:00, msvensson@neptunus.(none) +2 -3 Manual merge MERGE: 1.52.1.9 client/mysql_upgrade.c@stripped, 2006-11-27 10:45:02+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.6.1.8 include/my_sys.h@stripped, 2006-11-27 10:48:33+01:00, msvensson@neptunus.(none) +0 -0 Manual merge MERGE: 1.178.2.11 mysql-test/Makefile.am@stripped, 2006-11-27 10:45:02+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.66.1.10 mysql-test/mysql-test-run-shell.sh@stripped, 2006-11-27 10:45:03+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.262.18.2 mysql-test/mysql-test-run.pl@stripped, 2006-11-27 10:45:04+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.30.49.22 mysql-test/r/func_time.result@stripped, 2006-11-27 10:45:04+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.47.1.30 mysql-test/t/func_time.test@stripped, 2006-11-27 10:45:05+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.41.1.23 mysys/Makefile.am@stripped, 2006-11-27 10:45:05+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.62.1.10 mysys/my_mmap.c@stripped, 2006-11-27 10:45:05+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.7.1.2 sql-common/my_time.c@stripped, 2006-11-27 10:45:06+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.19.1.7 sql/item_timefunc.cc@stripped, 2006-11-27 10:45:06+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.100.1.33 sql/udf_example.c@stripped, 2006-11-27 10:45:06+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.29.1.3 support-files/mysql.spec.sh@stripped, 2006-11-27 10:48:02+01:00, msvensson@neptunus.(none) +0 -21 Use local MERGE: 1.99.1.58 # 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: msvensson # Host: neptunus.(none) # Root: /home/msvensson/mysql/mysql-5.1-new-maint/RESYNC --- 1.80/client/Makefile.am 2006-11-27 10:49:01 +01:00 +++ 1.81/client/Makefile.am 2006-11-27 10:49:02 +01:00 @@ -87,7 +87,8 @@ mysqltest_SOURCES= mysqltest.c \ $(top_srcdir)/mysys/my_copy.c mysqltest_LDADD = $(top_builddir)/regex/libregex.a $(LDADD) -mysql_upgrade_SOURCES= mysql_upgrade.c +mysql_upgrade_SOURCES= mysql_upgrade.c \ + $(top_srcdir)/mysys/my_getpagesize.c # Fix for mit-threads DEFS = -DUNDEF_THREADS_HACK \ --- 1.210/include/my_sys.h 2006-11-27 10:49:02 +01:00 +++ 1.211/include/my_sys.h 2006-11-27 10:49:02 +01:00 @@ -856,12 +856,6 @@ extern int my_getncpus(); #else #define my_mmap(a,b,c,d,e,f) mmap(a,b,c,d,e,f) #endif -#ifdef HAVE_GETPAGESIZE -#define my_getpagesize() getpagesize() -#else -/* qnx ? */ -#define my_getpagesize() 8192 -#endif #define my_munmap(a,b) munmap((a),(b)) #else @@ -879,9 +873,15 @@ extern int my_getncpus(); #define HAVE_MMAP #endif -int my_getpagesize(void); void *my_mmap(void *, size_t, int, int, int, my_off_t); int my_munmap(void *, size_t); +#endif + +/* my_getpagesize */ +#ifdef HAVE_GETPAGESIZE +#define my_getpagesize() getpagesize() +#else +int my_getpagesize(void); #endif int my_msync(int, void *, size_t, int); --- 1.84/mysys/Makefile.am 2006-11-27 10:49:02 +01:00 +++ 1.85/mysys/Makefile.am 2006-11-27 10:49:02 +01:00 @@ -25,7 +25,7 @@ noinst_HEADERS = mysys_priv.h my_static. libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ mf_path.c mf_loadpath.c my_file.c \ my_open.c my_create.c my_dup.c my_seek.c my_read.c \ - my_pread.c my_write.c \ + my_pread.c my_write.c my_getpagesize.c \ mf_keycache.c mf_keycaches.c my_crc32.c \ mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \ mf_tempdir.c my_lock.c mf_brkhant.c my_alarm.c \ --- 1.32/sql/udf_example.c 2006-11-27 10:49:02 +01:00 +++ 1.33/sql/udf_example.c 2006-11-27 10:49:02 +01:00 @@ -1087,12 +1087,13 @@ my_bool is_const_init(UDF_INIT *initid, strmov(message, "IS_CONST accepts only one argument"); return 1; } - initid->ptr= (args->args[0] != NULL) ? 1 : 0; + initid->ptr= (char*)((args->args[0] != NULL) ? 1 : 0); return 0; } -char * is_const(UDF_INIT *initid, UDF_ARGS *args, char *result, unsigned long - *length, char *is_null, char *error) +char * is_const(UDF_INIT *initid, UDF_ARGS *args __attribute__((unused)), + char *result, unsigned long *length, + char *is_null, char *error __attribute__((unused))) { if (initid->ptr != 0) { sprintf(result, "const"); --- 1.16/client/mysql_upgrade.c 2006-11-27 10:49:02 +01:00 +++ 1.17/client/mysql_upgrade.c 2006-11-27 10:49:02 +01:00 @@ -375,22 +375,24 @@ static int comp_names(struct fileinfo *a } -static int -find_file(const char *name, const char *root, uint flags, char *result, size_t len, ...) +static int find_file(const char *name, const char *root, + uint flags, char *result, size_t len, ...) { - int ret; + int ret= 1; va_list va; - FILEINFO key= { (char*)name, NULL }; const char *subdir; char *cp; - + FILEINFO key; + + /* Init key with name of the file to look for */ + key.name= (char*)name; + DBUG_ASSERT(root != NULL); cp= strmake(result, root, len); if (cp[-1] != FN_LIBCHAR) *cp++= FN_LIBCHAR; - ret= 1; va_start(va, len); subdir= (!(flags & MY_SEARCH_SELF)) ? va_arg(va, char *) : ""; while (subdir) @@ -597,7 +599,7 @@ fix_priv_tables: if (find_file(MYSQL_FIX_PRIV_TABLES_NAME, basedir, MYF(0), path, sizeof(path), - "support_files", "share/mysql", "scripts", + "support_files", "share", "share/mysql", "scripts", NullS) && find_file(MYSQL_FIX_PRIV_TABLES_NAME, "/usr/local/mysql", MYF(0), path, sizeof(path), --- 1.240/mysql-test/mysql-test-run.pl 2006-11-27 10:49:02 +01:00 +++ 1.241/mysql-test/mysql-test-run.pl 2006-11-27 10:49:02 +01:00 @@ -223,9 +223,8 @@ our $opt_ndbcluster_port_slave; our $opt_ndbconnectstring_slave; our $opt_record; -our $opt_report_features; +my $opt_report_features; our $opt_check_testcases; -my $opt_report_features; our $opt_skip; our $opt_skip_rpl; @@ -241,8 +240,6 @@ our $opt_suite_timeout; my $default_testcase_timeout= 15; # 15 min max my $default_suite_timeout= 180; # 3 hours max -our $opt_source_dist; - our $opt_start_and_exit; our $opt_start_dirty; our $opt_start_from; @@ -302,6 +299,8 @@ our $glob_tot_real_time= 0; our %mysqld_variables; +my $source_dist= 0; + ###################################################################### # @@ -635,7 +634,7 @@ sub command_line_setup () { if ( -d "../sql" ) { - $opt_source_dist= 1; + $source_dist= 1; } $glob_hostname= mtr_short_hostname(); @@ -659,7 +658,7 @@ sub command_line_setup () { # directory. And we install "/usr/share/mysql-test". Moving up one # more directory relative to "mysql-test" gives us a usable base # directory for RPM installs. - if ( ! $opt_source_dist and ! -d "$glob_basedir/bin" ) + if ( ! $source_dist and ! -d "$glob_basedir/bin" ) { $glob_basedir= dirname($glob_basedir); } @@ -671,7 +670,7 @@ sub command_line_setup () { unless -d $glob_mysql_bench_dir; $path_my_basedir= - $opt_source_dist ? $glob_mysql_test_dir : $glob_basedir; + $source_dist ? $glob_mysql_test_dir : $glob_basedir; $glob_timers= mtr_init_timers(); @@ -934,7 +933,7 @@ sub command_line_setup () { # -------------------------------------------------------------------------- # Gcov flag # -------------------------------------------------------------------------- - if ( $opt_gcov and ! $opt_source_dist ) + if ( $opt_gcov and ! $source_dist ) { mtr_error("Coverage test needs the source - please use source dist"); } @@ -1444,7 +1443,7 @@ sub executable_setup () { # Look for mysql_fix_privilege_tables.sql script $file_mysql_fix_privilege_tables= mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql", - "$path_share/mysql_fix_privilege_tables.sql"); + "$glob_basedir/share/mysql_fix_privilege_tables.sql"); if ( ! $opt_skip_ndbcluster and executable_setup_ndb()) { @@ -1599,7 +1598,7 @@ sub environment_setup () { # Setup LD_LIBRARY_PATH so the libraries from this distro/clone # are used in favor of the system installed ones # -------------------------------------------------------------------------- - if ( $opt_source_dist ) + if ( $source_dist ) { push(@ld_library_paths, "$glob_basedir/libmysql/.libs/", "$glob_basedir/libmysql_r/.libs/"); --- 1.10/mysys/my_mmap.c 2006-11-27 10:49:03 +01:00 +++ 1.11/mysys/my_mmap.c 2006-11-27 10:49:03 +01:00 @@ -33,13 +33,6 @@ int my_msync(int fd, void *addr, size_t static SECURITY_ATTRIBUTES mmap_security_attributes= {sizeof(SECURITY_ATTRIBUTES), 0, TRUE}; -int my_getpagesize(void) -{ - SYSTEM_INFO si; - GetSystemInfo(&si); - return si.dwPageSize; -} - void *my_mmap(void *addr, size_t len, int prot, int flags, int fd, my_off_t offset) {
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (msvensson:1.2391) | msvensson | 27 Nov |
© 1995-2008 MySQL AB. All rights reserved.
Page generated in 0.411 sec. using MySQL 5.1.14-beta-log