Commit f5f335aa authored by paul@ice.snake.net's avatar paul@ice.snake.net

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
parents 295f11ed 36bf1e71
...@@ -435,6 +435,10 @@ SOURCE=..\mysys\my_tempnam.c ...@@ -435,6 +435,10 @@ SOURCE=..\mysys\my_tempnam.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libmysql\my_time.c
# End Source File
# Begin Source File
SOURCE=..\mysys\my_thr_init.c SOURCE=..\mysys\my_thr_init.c
# End Source File # End Source File
# Begin Source File # Begin Source File
......
...@@ -796,7 +796,7 @@ AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init)) ...@@ -796,7 +796,7 @@ AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
# For compress in zlib # For compress in zlib
case $SYSTEM_TYPE in case $SYSTEM_TYPE in
*netware*) *netware* | *modesto*)
AC_DEFINE(HAVE_COMPRESS) AC_DEFINE(HAVE_COMPRESS)
;; ;;
*) *)
......
...@@ -16,10 +16,7 @@ ...@@ -16,10 +16,7 @@
#ifndef _dbug_h #ifndef _dbug_h
#define _dbug_h #define _dbug_h
#ifdef DBUG_OFF
#define NDEBUG /* for assert.h */
#endif
#include <assert.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
......
...@@ -313,6 +313,13 @@ C_MODE_END ...@@ -313,6 +313,13 @@ C_MODE_END
#include <crypt.h> #include <crypt.h>
#endif #endif
/*
A lot of our programs uses asserts, so better to always include it
This also fixes a problem when people uses DBUG_ASSERT without including
assert.h
*/
#include <assert.h>
/* Go around some bugs in different OS and compilers */ /* Go around some bugs in different OS and compilers */
#if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H) #if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H)
#include <sys/stream.h> /* HPUX 10.20 defines ulong here. UGLY !!! */ #include <sys/stream.h> /* HPUX 10.20 defines ulong here. UGLY !!! */
...@@ -1020,22 +1027,22 @@ do { doubleget_union _tmp; \ ...@@ -1020,22 +1027,22 @@ do { doubleget_union _tmp; \
32)) 32))
#define int2store(T,A) do { uint def_temp= (uint) (A) ;\ #define int2store(T,A) do { uint def_temp= (uint) (A) ;\
*((uchar*) (T))= (uchar)(def_temp); \ *((uchar*) (T))= (uchar)(def_temp); \
*((uchar*) (T+1))=(uchar)((def_temp >> 8)); \ *((uchar*) (T)+1)=(uchar)((def_temp >> 8)); \
} while(0) } while(0)
#define int3store(T,A) do { /*lint -save -e734 */\ #define int3store(T,A) do { /*lint -save -e734 */\
*((uchar*)(T))=(uchar) ((A));\ *((uchar*)(T))=(uchar) ((A));\
*((uchar*) (T)+1)=(uchar) (((A) >> 8));\ *((uchar*) (T)+1)=(uchar) (((A) >> 8));\
*((uchar*)(T)+2)=(uchar) (((A) >> 16)); \ *((uchar*)(T)+2)=(uchar) (((A) >> 16)); \
/*lint -restore */} while(0) /*lint -restore */} while(0)
#define int4store(T,A) do { *(T)=(char) ((A));\ #define int4store(T,A) do { *((char *)(T))=(char) ((A));\
*((T)+1)=(char) (((A) >> 8));\ *(((char *)(T))+1)=(char) (((A) >> 8));\
*((T)+2)=(char) (((A) >> 16));\ *(((char *)(T))+2)=(char) (((A) >> 16));\
*((T)+3)=(char) (((A) >> 24)); } while(0) *(((char *)(T))+3)=(char) (((A) >> 24)); } while(0)
#define int5store(T,A) do { *(T)=((A));\ #define int5store(T,A) do { *((char *)(T))=((A));\
*((T)+1)=(((A) >> 8));\ *(((char *)(T))+1)=(((A) >> 8));\
*((T)+2)=(((A) >> 16));\ *(((char *)(T))+2)=(((A) >> 16));\
*((T)+3)=(((A) >> 24)); \ *(((char *)(T))+3)=(((A) >> 24)); \
*((T)+4)=(((A) >> 32)); } while(0) *(((char *)(T))+4)=(((A) >> 32)); } while(0)
#define int8store(T,A) do { uint def_temp= (uint) (A), def_temp2= (uint) ((A) >> 32); \ #define int8store(T,A) do { uint def_temp= (uint) (A), def_temp2= (uint) ((A) >> 32); \
int4store((T),def_temp); \ int4store((T),def_temp); \
int4store((T+4),def_temp2); } while(0) int4store((T+4),def_temp2); } while(0)
......
...@@ -6,5 +6,5 @@ drop table t1; ...@@ -6,5 +6,5 @@ drop table t1;
flush tables; flush tables;
CREATE TABLE t1 (a int) ENGINE=INNODB; CREATE TABLE t1 (a int) ENGINE=INNODB;
SELECT * from T1; SELECT * from T1;
ERROR HY000: Can't open file: 'T1.InnoDB'. (errno: 1) ERROR HY000: Can't open file: 'T1.InnoDB' (errno: 1)
drop table t1; drop table t1;
...@@ -102,7 +102,7 @@ then ...@@ -102,7 +102,7 @@ then
fi fi
cmd="$bindir/mysql -f --user=$user --host=$host" cmd="$bindir/mysql -f --user=$user --host=$host"
if test -z "$password" ; then if test ! -z "$password" ; then
cmd="$cmd --password=$password" cmd="$cmd --password=$password"
fi fi
if test ! -z "$port"; then if test ! -z "$port"; then
...@@ -155,7 +155,7 @@ s_echo "" ...@@ -155,7 +155,7 @@ s_echo ""
if test $verbose = 1 if test $verbose = 1
then then
s_echo "You can safely ignore all 'Duplicate column' and 'Unknown column' errors" s_echo "You can safely ignore all 'Duplicate column' and 'Unknown column' errors"
s_echo "as this just means that your tables where already up to date." s_echo "because these just mean that your tables are already up to date."
s_echo "This script is safe to run even if your tables are already up to date!" s_echo "This script is safe to run even if your tables are already up to date!"
s_echo "" s_echo ""
fi fi
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
-- for MySQL 4.0. -- for MySQL 4.0.
-- You can safely ignore all 'Duplicate column' and 'Unknown column' errors" -- You can safely ignore all 'Duplicate column' and 'Unknown column' errors"
-- because these just mean that your tables are already up to date.
-- This script is safe to run even if your tables are already up to date! -- This script is safe to run even if your tables are already up to date!
-- On unix, you should use the mysql_fix_privilege_tables script to execute -- On unix, you should use the mysql_fix_privilege_tables script to execute
......
...@@ -91,11 +91,10 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ ...@@ -91,11 +91,10 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \
gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \ gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \
tztime.cc my_time.c \ tztime.cc my_time.c \
examples/ha_example.cc examples/ha_archive.cc examples/ha_example.cc examples/ha_archive.cc
gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_SOURCES = gen_lex_hash.cc
gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
mysql_tzinfo_to_sql_SOURCES = mysql_tzinfo_to_sql.cc
mysql_tzinfo_to_sql_SOURCES = mysql_tzinfo_to_sql_tztime.cc
mysql_tzinfo_to_sql_CXXFLAGS = -DTZINFO2SQL $(AM_CXXFLAGS)
mysql_tzinfo_to_sql_LDADD = $(LDADD) $(CXXLDFLAGS) mysql_tzinfo_to_sql_LDADD = $(LDADD) $(CXXLDFLAGS)
DEFS = -DMYSQL_SERVER \ DEFS = -DMYSQL_SERVER \
...@@ -108,7 +107,11 @@ BUILT_SOURCES = sql_yacc.cc sql_yacc.h ...@@ -108,7 +107,11 @@ BUILT_SOURCES = sql_yacc.cc sql_yacc.h
EXTRA_DIST = udf_example.cc $(BUILT_SOURCES) EXTRA_DIST = udf_example.cc $(BUILT_SOURCES)
AM_YFLAGS = -d AM_YFLAGS = -d
link_sources: mysql_tzinfo_to_sql.cc:
rm -f mysql_tzinfo_to_sql.cc
@LN_CP_F@ tztime.cc mysql_tzinfo_to_sql.cc
link_sources: mysql_tzinfo_to_sql.cc
rm -f mini_client_errors.c rm -f mini_client_errors.c
@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c @LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c
rm -f pack.c rm -f pack.c
...@@ -121,9 +124,8 @@ link_sources: ...@@ -121,9 +124,8 @@ link_sources:
gen_lex_hash.o: gen_lex_hash.cc lex.h gen_lex_hash.o: gen_lex_hash.cc lex.h
$(CXXCOMPILE) -c $(INCLUDES) $< $(CXXCOMPILE) -c $(INCLUDES) $<
mysql_tzinfo_to_sql_tztime.cc: tztime.cc mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES)
rm -f $(srcdir)/mysql_tzinfo_to_sql_tztime.cc $(CXXCOMPILE) -c $(INCLUDES) -DTZINFO2SQL $<
@LN_CP_F@ $(srcdir)/tztime.cc $(srcdir)/mysql_tzinfo_to_sql_tztime.cc
# Try to get better dependencies for the grammar. Othervise really bad # Try to get better dependencies for the grammar. Othervise really bad
# things like different grammars for different pars of MySQL can # things like different grammars for different pars of MySQL can
......
...@@ -94,7 +94,7 @@ class ha_berkeley: public handler ...@@ -94,7 +94,7 @@ class ha_berkeley: public handler
changed_rows(0),last_dup_key((uint) -1),version(0),using_ignore(0) {} changed_rows(0),last_dup_key((uint) -1),version(0),using_ignore(0) {}
~ha_berkeley() {} ~ha_berkeley() {}
const char *table_type() const { return "BerkeleyDB"; } const char *table_type() const { return "BerkeleyDB"; }
ulong ha_berkeley::index_flags(uint idx, uint part) const ulong index_flags(uint idx, uint part) const
{ {
ulong flags=HA_READ_NEXT | HA_READ_PREV; ulong flags=HA_READ_NEXT | HA_READ_PREV;
if (part == (uint)~0 || if (part == (uint)~0 ||
......
...@@ -333,17 +333,11 @@ class Item_field :public Item_ident ...@@ -333,17 +333,11 @@ class Item_field :public Item_ident
void set_field(Field *field); void set_field(Field *field);
public: public:
Field *field,*result_field; Field *field,*result_field;
#ifndef DBUG_OFF
bool double_fix;
#endif
Item_field(const char *db_par,const char *table_name_par, Item_field(const char *db_par,const char *table_name_par,
const char *field_name_par) const char *field_name_par)
:Item_ident(db_par,table_name_par,field_name_par), :Item_ident(db_par,table_name_par,field_name_par),
field(0), result_field(0) field(0), result_field(0)
#ifndef DBUG_OFF
,double_fix(0)
#endif
{ collation.set(DERIVATION_IMPLICIT); } { collation.set(DERIVATION_IMPLICIT); }
// Constructor need to process subselect with temporary tables (see Item) // Constructor need to process subselect with temporary tables (see Item)
Item_field(THD *thd, Item_field *item); Item_field(THD *thd, Item_field *item);
......
...@@ -3408,6 +3408,7 @@ int mysql_recreate_table(THD *thd, TABLE_LIST *table_list, ...@@ -3408,6 +3408,7 @@ int mysql_recreate_table(THD *thd, TABLE_LIST *table_list,
lex->key_list.empty(); lex->key_list.empty();
lex->col_list.empty(); lex->col_list.empty();
lex->alter_info.reset(); lex->alter_info.reset();
lex->alter_info.is_simple= 0; // Force full recreate
bzero((char*) &create_info,sizeof(create_info)); bzero((char*) &create_info,sizeof(create_info));
create_info.db_type=DB_TYPE_DEFAULT; create_info.db_type=DB_TYPE_DEFAULT;
create_info.row_type=ROW_TYPE_DEFAULT; create_info.row_type=ROW_TYPE_DEFAULT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment