Commit a5c75df3 authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql

parents 263811a4 3666dab5

BitKeeper/etc/logging_ok

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ monty@donna.mysql.com 
monty@narttu.mysql.fi

mwagner@evoq.home.mwagner.org

mwagner@work.mysql.com

sasha@donna.mysql.com

sasha@laptop.slkc.uswest.net

sasha@mysql.sashanet.com

sasha@work.mysql.com
@@ -14,4 +15,3 @@ tim@threads.polyesthetic.msg 
tim@work.mysql.com

yfaktoro@nbyfaktoro.bedford.progress.com

yfaktoro@nslinuxw2.bedford.progress.com
 
sasha@donna.mysql.com

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -39275,6 +39275,8 @@ though, so Version 3.23 is not released as a stable version yet. 
@appendixsubsec Changes in release 3.23.29

@itemize @bullet

@item

Fixed that @code{DROP DATABASE} works on OS/2.

@item

Fixed bug when doing a @code{SELECT DISTINCT ... table1 LEFT JOIN

table2..} when table2 was empty.

@item

client/mysql.cc

+4 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include "my_readline.h"

#include <signal.h>



const char *VER="11.8";

const char *VER="11.9";



gptr sql_alloc(unsigned size);	     // Don't use mysqld alloc for these

void sql_element_free(void *ptr);
@@ -377,7 +377,7 @@ enum options {OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, 


static struct option long_options[] =

{

  {"i-am-a-dummy",  no_argument,	   0, 'U'},

  {"i-am-a-dummy",  optional_argument,	   0, 'U'},

  {"batch",	    no_argument,	   0, 'B'},

  {"character-sets-dir",required_argument, 0, OPT_CHARSETS_DIR},

  {"compress",	    no_argument,	   0, 'C'},
@@ -413,7 +413,7 @@ static struct option long_options[] = 
  {"quick",	    no_argument,	   0, 'q'},

  {"set-variable",  required_argument,	   0, 'O'},

  {"raw",	    no_argument,	   0, 'r'},

  {"safe-updates",  no_argument,	   0, 'U'},

  {"safe-updates",  optional_argument,	   0, 'U'},

  {"silent",	    no_argument,	   0, 's'},

  {"skip-column-names",no_argument,	   0, 'N'},

  {"skip-line-numbers",no_argument,	   0, 'L'},
@@ -558,7 +558,7 @@ static int get_options(int argc, char **argv) 


  set_all_changeable_vars(changeable_vars);

  while ((c=getopt_long(argc,argv,

			"?ABCD:LfgGHinNoqrstTUvVwWEe:h:O:P:S:u:#::p::",

			"?ABCD:LfgGHinNoqrstTU::vVwWEe:h:O:P:S:u:#::p::",

			long_options, &option_index)) != EOF)

  {

    switch(c) {

sql/Makefile.am

+4 −2
Original line number Diff line number Diff line
@@ -43,8 +43,9 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ 
			item_create.h mysql_priv.h \

			procedure.h sql_class.h sql_lex.h sql_list.h \

			sql_manager.h sql_map.h sql_string.h unireg.h \

			field.h handler.h ha_isammrg.h ha_isam.h ha_myisammrg.h\

			ha_heap.h ha_myisam.h ha_berkeley.h\

			field.h handler.h \

			ha_isammrg.h ha_isam.h ha_myisammrg.h\

			ha_heap.h ha_myisam.h ha_berkeley.h ha_innobase.h \

			opt_range.h opt_ft.h \

			sql_select.h structs.h table.h sql_udf.h hash_filo.h\

			lex.h lex_symbol.h sql_acl.h sql_crypt.h md5.h \
@@ -66,6 +67,7 @@ mysqld_SOURCES = sql_lex.cc \ 
		   	records.cc filesort.cc handler.cc \

		        ha_isam.cc ha_isammrg.cc ha_heap.cc \

			ha_myisam.cc ha_myisammrg.cc ha_berkeley.cc \

	                ha_innobase.cc \

			sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \

			sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \

			sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \

sql/ha_innobase.cc

0 → 100644
+2431 −0

File added.

Preview size limit exceeded, changes collapsed.