Below is the list of changes that have just been committed into a local
5.0 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
1.1897 05/04/27 12:56:01 msvensson@neptunus.(none) +9 -0
Merge from 4.1 to 5.0
mysql-test/t/archive.test
1.6 05/04/27 12:55:57 msvensson@neptunus.(none) +0 -0
Manual merge
mysql-test/r/archive.result
1.5 05/04/27 12:55:57 msvensson@neptunus.(none) +0 -0
Manual merge
configure.in
1.294 05/04/27 12:55:57 msvensson@neptunus.(none) +0 -0
manual merge
BUILD/SETUP.sh
1.41 05/04/27 12:55:57 msvensson@neptunus.(none) +1 -1
Manual merge of conflicts
-DBIG_TABLES removed set by configure using --with-big-tables
sql/examples/ha_archive.h
1.17 05/04/27 12:51:30 msvensson@neptunus.(none) +0 -0
Auto merged
sql/examples/ha_archive.cc
1.35 05/04/27 12:51:30 msvensson@neptunus.(none) +0 -0
Auto merged
ndb/src/ndbapi/ndberror.c
1.35 05/04/27 12:51:30 msvensson@neptunus.(none) +0 -0
Auto merged
include/my_pthread.h
1.82 05/04/27 12:51:30 msvensson@neptunus.(none) +0 -0
Auto merged
client/mysql.cc
1.163 05/04/27 12:51:30 msvensson@neptunus.(none) +0 -0
Auto merged
# 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.0/RESYNC
--- 1.162/client/mysql.cc 2005-04-26 13:02:11 +02:00
+++ 1.163/client/mysql.cc 2005-04-27 12:51:30 +02:00
@@ -703,8 +703,16 @@
#ifdef __NETWARE__
#define printf consoleprintf
#endif
- printf("%s Ver %s Distrib %s, for %s (%s)\n",
- my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
+
+#if defined(USE_LIBEDIT_INTERFACE)
+ const char* readline= "";
+#else
+ const char* readline= "readline";
+#endif
+
+ printf("%s Ver %s Distrib %s, for %s (%s) using %s %s\n",
+ my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
+ readline, rl_library_version);
if (version)
return;
printf("\
@@ -1323,7 +1331,7 @@
setlocale(LC_ALL,""); /* so as libedit use isprint */
#endif
rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
- rl_completion_entry_function= (CPFunction*)&no_completion;
+ rl_completion_entry_function= (Function*)&no_completion;
#else
rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
rl_completion_entry_function= (Function*)&no_completion;
--- 1.293/configure.in 2005-04-27 12:30:08 +02:00
+++ 1.294/configure.in 2005-04-27 12:55:57 +02:00
@@ -116,6 +116,7 @@
AC_SUBST(SAVE_CXXLDFLAGS)
AC_SUBST(CXXLDFLAGS)
+AC_PREREQ(2.58)dnl Minimum Autoconf version required.
#AC_ARG_PROGRAM # Automaticly invoked by AM_INIT_AUTOMAKE
@@ -2386,17 +2387,24 @@
compile_readline=yes
AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)
else
+ # Use system readline library
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
MYSQL_CHECK_LIBEDIT_INTERFACE
MYSQL_CHECK_NEW_RL_INTERFACE
MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY
AC_LANG_RESTORE
- if [test "$mysql_cv_new_rl_interface" = "yes"] || [test "$mysql_cv_libedit_interface" = "no"]
+ if [test "$mysql_cv_new_rl_interface" = "yes"]
then
+ # Use the new readline interface
readline_link="-lreadline"
- else
+ elif [test "$mysql_cv_libedit_interface" = "yes"]; then
+ # Use libedit
readline_link="-ledit"
+ else
+ AC_MSG_ERROR([Could not find system readline or libedit libraries
+ Use --with-readline or --with-libedit to use the bundled
+ versions of libedit or readline])
fi
fi
fi
--- 1.81/include/my_pthread.h 2005-04-05 13:17:39 +02:00
+++ 1.82/include/my_pthread.h 2005-04-27 12:51:30 +02:00
@@ -604,19 +604,13 @@
#define pthread_attr_setstacksize(A,B) pthread_dummy(0)
#endif
-/* Define mutex types */
+/* Define mutex types, see my_thr_init.c */
#define MY_MUTEX_INIT_SLOW NULL
-#define MY_MUTEX_INIT_FAST NULL
-#define MY_MUTEX_INIT_ERRCHK NULL
#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
extern pthread_mutexattr_t my_fast_mutexattr;
-#undef MY_MUTEX_INIT_FAST
#define MY_MUTEX_INIT_FAST &my_fast_mutexattr
-#endif
-#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
-extern pthread_mutexattr_t my_errchk_mutexattr;
-#undef MY_INIT_MUTEX_ERRCHK
-#define MY_INIT_MUTEX_ERRCHK &my_errchk_mutexattr
+#else
+#define MY_MUTEX_INIT_FAST NULL
#endif
extern my_bool my_thread_global_init(void);
--- 1.4/mysql-test/r/archive.result 2004-12-09 10:48:00 +01:00
+++ 1.5/mysql-test/r/archive.result 2005-04-27 12:55:57 +02:00
@@ -5020,4 +5020,18 @@
3 011402 37 Romans scholastics jarring
4 011403 37 intercepted audiology tinily
INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
-drop table t1, t2;
+create table t3 engine=archive select * from t2;
+select * from t3 where fld3='bonfire';
+auto fld1 companynr fld3 fld4 fld5 fld6
+1191 068504 00 bonfire corresponds positively
+select count(*) from t3;
+count(*)
+1203
+rename table t3 to t4;
+select * from t4 where fld3='bonfire';
+auto fld1 companynr fld3 fld4 fld5 fld6
+1191 068504 00 bonfire corresponds positively
+select count(*) from t4;
+count(*)
+1203
+drop table t1, t2, t4;
--- 1.5/mysql-test/t/archive.test 2005-01-26 15:38:31 +01:00
+++ 1.6/mysql-test/t/archive.test 2005-04-27 12:55:57 +02:00
@@ -1312,4 +1312,15 @@
#
# Cleanup, test is over
#
-drop table t1, t2;
+
+#
+# Test rename of table
+#
+create table t3 engine=archive select * from t2;
+select * from t3 where fld3='bonfire';
+select count(*) from t3;
+rename table t3 to t4;
+select * from t4 where fld3='bonfire';
+select count(*) from t4;
+
+drop table t1, t2, t4;
--- 1.34/sql/examples/ha_archive.cc 2005-04-27 11:25:03 +02:00
+++ 1.35/sql/examples/ha_archive.cc 2005-04-27 12:51:30 +02:00
@@ -447,6 +447,30 @@
}
+/*
+ Rename all files that this handler defines in bas_ext list
+
+ NOTE Don't care if the .arn file is missing
+*/
+int ha_archive::rename_table(const char * from, const char * to)
+{
+ DBUG_ENTER("ha_archive::rename_table");
+ for (const char **ext=bas_ext(); *ext ; ext++)
+ {
+ if (rename_file_ext(from,to,*ext))
+ {
+ if (my_errno == ENOENT &&
+ !my_strcasecmp(system_charset_info, *ext, ARN))
+ continue;
+
+ DBUG_RETURN(my_errno);
+ }
+
+ }
+ DBUG_RETURN(0);
+}
+
+
/*
When opening a file we:
Create/get our shared structure.
--- 1.16/sql/examples/ha_archive.h 2005-02-17 22:52:31 +01:00
+++ 1.17/sql/examples/ha_archive.h 2005-04-27 12:51:30 +02:00
@@ -104,6 +104,7 @@
int end_bulk_insert();
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
enum thr_lock_type lock_type);
+ int rename_table(const char * from, const char * to);
};
handlerton *archive_db_init(void);
--- 1.40/BUILD/SETUP.sh 2005-03-30 17:44:59 +02:00
+++ 1.41/BUILD/SETUP.sh 2005-04-27 12:55:57 +02:00
@@ -53,11 +53,14 @@
max_no_es_configs="$max_leave_isam_configs --without-isam"
max_configs="$max_no_es_configs --with-embedded-server"
-alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet
-amd64_cflags="" # If dropping '--with-big-tables', add here "-DBIG_TABLES"
-pentium_cflags="-mcpu=pentiumpro"
-pentium64_cflags="-mcpu=nocona -m64"
-ppc_cflags="-mpowerpc -mcpu=powerpc"
+path=`dirname $0`
+. "$path/check-cpu"
+
+alpha_cflags="$check_cpu_cflags -Wa,-m$cpu_flag"
+amd64_cflags="$check_cpu_cflags"
+pentium_cflags="$check_cpu_cflags"
+pentium64_cflags="$check_cpu_cflags -m64"
+ppc_cflags="$check_cpu_cflags"
sparc_cflags=""
# be as fast as we can be without losing our ability to backtrace
| Thread |
|---|
| • bk commit into 5.0 tree (msvensson:1.1897) | msvensson | 27 Apr |
