Commit 372402ab authored by unknown's avatar unknown
Browse files

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

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-push


sql/item.cc:
  Auto merged
parents 24b75abb 6aaccbcb

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -780,3 +780,6 @@ ndb/src/common/mgmcommon/printConfig/*.d 
ndb/src/mgmclient/test_cpcd/*.d

*.d

libmysqld/examples/client_test.c

sql/test_time

sql/mysql_tzinfo_to_sql

libmysqld/tztime.cc

include/my_global.h

+8 −0
Original line number Diff line number Diff line
@@ -1101,6 +1101,14 @@ do { doubleget_union _tmp; \ 


#endif /* sint2korr */



/*

  Macro for reading 32-bit integer from network byte order (big-endian)

  from unaligned memory location.

*/

#define int4net(A)        (int32) (((uint32) ((uchar) (A)[3]))        |\

				  (((uint32) ((uchar) (A)[2])) << 8)  |\

				  (((uint32) ((uchar) (A)[1])) << 16) |\

				  (((uint32) ((uchar) (A)[0])) << 24))

/*

  Define-funktions for reading and storing in machine format from/to

  short/long to/from some place in memory V should be a (not

include/mysqld_error.h

+3 −1
Original line number Diff line number Diff line
@@ -314,4 +314,6 @@ 
#define ER_UNSUPPORTED_PS 1295

#define ER_GET_ERRMSG 1296

#define ER_GET_TEMPORARY_ERRMSG 1297

#define ER_ERROR_MESSAGES 298
 
#define ER_UNKNOWN_TIME_ZONE 1298

#define ER_WARN_INVALID_TIMESTAMP 1299

#define ER_ERROR_MESSAGES 300

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \

	sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \

	unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \

	spatial.cc gstream.cc sql_help.cc

	spatial.cc gstream.cc sql_help.cc tztime.cc



libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)

libmysqld_a_SOURCES=

libmysqld/lib_sql.cc

+7 −5
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ int init_embedded_server(int argc, char **argv, char **groups) 
  int fake_argc = 1;

  char *fake_argv[] = { (char *)"", 0 };

  const char *fake_groups[] = { "server", "embedded", 0 };

  my_bool acl_error;

  if (argc)

  {

    argcp= &argc;
@@ -397,16 +398,17 @@ int init_embedded_server(int argc, char **argv, char **groups) 


  error_handler_hook = my_message_sql;



  acl_error= 0;

#ifndef NO_EMBEDDED_ACCESS_CHECKS

  if (acl_init((THD *)0, opt_noacl))

  if (!(acl_error= acl_init((THD *)0, opt_noacl)) &&

      !opt_noacl)

    (void) grant_init((THD *)0);

#endif

  if (acl_error || my_tz_init((THD *)0, default_tz_name, opt_bootstrap))

  {

    mysql_server_end();

    return 1;

  }

  if (!opt_noacl)

    (void) grant_init((THD *)0);



#endif



  init_max_user_conn();

  init_update_queries();