Merge

BUILD/FINISH.sh

@@ -22,7 +22,7 @@ if [ "x$strip" = "xyes" ]
 then
   commands="$commands
 
-mkdir tmp
+mkdir -p tmp
 nm --numeric-sort sql/mysqld  > tmp/mysqld.sym
 objdump -d sql/mysqld > tmp/mysqld.S
 strip sql/mysqld"

extra/resolve_stack_dump.c

@@ -31,7 +31,7 @@
 #define INIT_SYM_TABLE  4096
 #define INC_SYM_TABLE  4096
 #define MAX_SYM_SIZE   128
-#define DUMP_VERSION "1.0"
+#define DUMP_VERSION "1.1"
 #define HEX_INVALID  (uchar)255
 
 typedef ulong my_long_addr_t ; /* at some point, we need to fix configure
@@ -198,6 +198,8 @@ static int init_sym_entry(SYM_ENTRY* se, char* buf)
 	break;
     }
   *p = 0;
+  if(!strcmp(se->symbol, "gcc2_compiled."))
+    return -1;
   return 0;
 }
 

include/Makefile.am

@@ -23,7 +23,7 @@ pkginclude_HEADERS =	dbug.h m_string.h my_sys.h mysql.h mysql_com.h \
 			sslopt-case.h sslopt-longopts.h sslopt-usage.h \
 			sslopt-vars.h $(BUILT_SOURCES)
 noinst_HEADERS =	global.h config-win.h \
-			nisam.h heap.h merge.h \
+			nisam.h heap.h merge.h my_bitmap.h\
 			myisam.h myisampack.h myisammrg.h ft_global.h\
 			my_dir.h mysys_err.h my_base.h \
 			my_nosys.h my_alarm.h queues.h \

mysql-test/r/alias.result

+Kundentyp	kategorie
+Privat (Private Nutzung)	Mobilfunk

mysql-test/t/alias.test

+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (
+  cont_nr int(11) NOT NULL auto_increment,
+  ver_nr int(11) NOT NULL default '0',
+  aufnr int(11) NOT NULL default '0',
+  username varchar(50) NOT NULL default '',
+  hdl_nr int(11) NOT NULL default '0',
+  eintrag date NOT NULL default '0000-00-00',
+  st_klasse varchar(40) NOT NULL default '',
+  st_wert varchar(40) NOT NULL default '',
+  st_zusatz varchar(40) NOT NULL default '',
+  st_bemerkung varchar(255) NOT NULL default '',
+  kunden_art varchar(40) NOT NULL default '',
+  mcbs_knr int(11) default NULL,
+  mcbs_aufnr int(11) NOT NULL default '0',
+  schufa_status char(1) default '?',
+  bemerkung text,
+  wirknetz text,
+  wf_igz int(11) NOT NULL default '0',
+  tarifcode varchar(80) default NULL,
+  recycle char(1) default NULL,
+  sim varchar(30) default NULL,
+  mcbs_tpl varchar(30) default NULL,
+  emp_nr int(11) NOT NULL default '0',
+  laufzeit int(11) default NULL,
+  hdl_name varchar(30) default NULL,
+  prov_hdl_nr int(11) NOT NULL default '0',
+  auto_wirknetz varchar(50) default NULL,
+  auto_billing varchar(50) default NULL,
+  touch timestamp(14) NOT NULL,
+  kategorie varchar(50) default NULL,
+  kundentyp varchar(20) NOT NULL default '',
+  sammel_rech_msisdn varchar(30) NOT NULL default '',
+  p_nr varchar(9) NOT NULL default '',
+  suffix char(3) NOT NULL default '',
+  PRIMARY KEY (cont_nr),
+  KEY idx_aufnr(aufnr),
+  KEY idx_hdl_nr(hdl_nr),
+  KEY idx_st_klasse(st_klasse),
+  KEY ver_nr(ver_nr),
+  KEY eintrag_idx(eintrag),
+  KEY emp_nr_idx(emp_nr),
+  KEY wf_igz(wf_igz),
+  KEY touch(touch),
+  KEY hdl_tag(eintrag,hdl_nr),
+  KEY prov_hdl_nr(prov_hdl_nr),
+  KEY mcbs_aufnr(mcbs_aufnr),
+  KEY kundentyp(kundentyp),
+  KEY p_nr(p_nr,suffix)
+) TYPE=MyISAM;
+
+INSERT INTO t1 VALUES (3359356,405,3359356,'Mustermann Musterfrau',52500,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprft','','privat',1485525,2122316,'+','','N',1909160,'MobilComSuper92000D2',NULL,NULL,'MS9ND2',3,24,'MobilCom Shop Koeln',52500,NULL,'auto',20010202105916,'Mobilfunk','PP','','','');
+INSERT INTO t1 VALUES (3359357,468,3359357,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprft','','privat',1503580,2139699,'+','','P',1909171,'MobilComSuper9D1T10SFreisprech(Akquise)',NULL,NULL,'MS9NS1',327,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','','');
+INSERT INTO t1 VALUES (3359358,407,3359358,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprft','','privat',1501358,2137473,'N','','N',1909159,'MobilComSuper92000D2',NULL,NULL,'MS9ND2',325,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','','');
+INSERT INTO t1 VALUES (3359359,468,3359359,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprft','','privat',1507831,2143894,'+','','P',1909162,'MobilComSuper9D1T10SFreisprech(Akquise)',NULL,NULL,'MS9NS1',327,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','','');
+INSERT INTO t1 VALUES (3359360,0,0,'Mustermann Musterfrau',29674907,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprft','','privat',1900169997,2414578,'+',NULL,'N',1909148,'',NULL,NULL,'RV99066_2',20,NULL,'POS',29674907,NULL,NULL,20010202105916,'Mobilfunk','','','97317481','007');
+INSERT INTO t1 VALUES (3359361,406,3359361,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag storniert','','(7001-84):Storno, Kd. mchte nicht mehr','privat',NULL,0,'+','','P',1909150,'MobilComSuper92000D1(Akquise)',NULL,NULL,'MS9ND1',325,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','','');
+INSERT INTO t1 VALUES (3359362,406,3359362,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprft','','privat',1509984,2145874,'+','','P',1909154,'MobilComSuper92000D1(Akquise)',NULL,NULL,'MS9ND1',327,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','','');
+
+# This died because we used the field Kundentyp twice
+
+SELECT ELT(FIELD(kundentyp,'PP','PPA','PG','PGA','FK','FKA','FP','FPA','K','KA','V','VA',''), 'Privat (Private Nutzung)','Privat (Private Nutzung) Sitz im Ausland','Privat (geschaeftliche Nutzung)','Privat (geschaeftliche Nutzung) Sitz im Ausland','Firma (Kapitalgesellschaft)','Firma (Kapitalgesellschaft) Sitz im Ausland','Firma (Personengesellschaft)','Firma (Personengesellschaft) Sitz im Ausland','oeff. rechtl. Koerperschaft','oeff. rechtl. Koerperschaft Sitz im Ausland','Eingetragener Verein','Eingetragener Verein Sitz im Ausland','Typ unbekannt') AS Kundentyp ,kategorie FROM t1 WHERE hdl_nr < 2000000 AND kategorie IN ('Prepaid','Mobilfunk') AND st_klasse = 'Workflow' GROUP BY kundentyp ORDER BY kategorie;
+
+drop table t1;

mysys/my_init.c

@@ -72,6 +72,9 @@ void my_init(void)
 #ifdef THREAD
 #if defined(HAVE_PTHREAD_INIT)
   pthread_init();			/* Must be called before DBUG_ENTER */
+#endif
+#ifdef UNIXWARE7
+  (void) isatty(0);			/* Go around connect() bug in UW7 */
 #endif
   my_thread_global_init();
 #ifndef __WIN__

readline/input.c

@@ -41,9 +41,8 @@
 #  include "ansi_stdlib.h"
 #endif /* HAVE_STDLIB_H */
 
-#include <time.h>
 #if defined (HAVE_SELECT)
-#  if !defined (HAVE_SYS_SELECT_H) || !defined (M_UNIX)
+#  if !defined (HAVE_SYS_SELECT_H) || !defined (M_UNIX) || defined(TIME_WITH_SYS_TIME)
 #    include <sys/time.h>
 #  endif
 #endif /* HAVE_SELECT */

scripts/mysql_install_db.sh

@@ -150,9 +150,9 @@ then
 
   # mysqld --bootstrap wants one command/line
   c_d="$c_d CREATE TABLE db ("
-  c_d="$c_d   Host char(60) DEFAULT '' NOT NULL,"
-  c_d="$c_d   Db char(64) DEFAULT '' NOT NULL,"
-  c_d="$c_d   User char(16) DEFAULT '' NOT NULL,"
+  c_d="$c_d   Host char(60) binary DEFAULT '' NOT NULL,"
+  c_d="$c_d   Db char(64) binary DEFAULT '' NOT NULL,"
+  c_d="$c_d   User char(16) binary DEFAULT '' NOT NULL,"
   c_d="$c_d   Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
   c_d="$c_d   Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
   c_d="$c_d   Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
@@ -177,8 +177,8 @@ then
   echo "Preparing host table"
 
   c_h="$c_h CREATE TABLE host ("
-  c_h="$c_h  Host char(60) DEFAULT '' NOT NULL,"
-  c_h="$c_h  Db char(64) DEFAULT '' NOT NULL,"
+  c_h="$c_h  Host char(60) binary DEFAULT '' NOT NULL,"
+  c_h="$c_h  Db char(64) binary DEFAULT '' NOT NULL,"
   c_h="$c_h  Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
   c_h="$c_h  Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
   c_h="$c_h  Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
@@ -199,9 +199,9 @@ then
   echo "Preparing user table"
 
   c_u="$c_u CREATE TABLE user ("
-  c_u="$c_u   Host char(60) DEFAULT '' NOT NULL,"
-  c_u="$c_u   User char(16) DEFAULT '' NOT NULL,"
-  c_u="$c_u   Password char(16) DEFAULT '' NOT NULL,"
+  c_u="$c_u   Host char(60) binary DEFAULT '' NOT NULL,"
+  c_u="$c_u   User char(16) binary DEFAULT '' NOT NULL,"
+  c_u="$c_u   Password char(16) binary DEFAULT '' NOT NULL,"
   c_u="$c_u   Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
   c_u="$c_u   Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
   c_u="$c_u   Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
@@ -235,7 +235,7 @@ then
   echo "Preparing func table"
 
   c_f="$c_f CREATE TABLE func ("
-  c_f="$c_f   name char(64) DEFAULT '' NOT NULL,"
+  c_f="$c_f   name char(64) binary DEFAULT '' NOT NULL,"
   c_f="$c_f   ret tinyint(1) DEFAULT '0' NOT NULL,"
   c_f="$c_f   dl char(128) DEFAULT '' NOT NULL,"
   c_f="$c_f   type enum ('function','aggregate') NOT NULL,"
@@ -249,10 +249,10 @@ then
   echo "Preparing tables_priv table"
 
   c_t="$c_t CREATE TABLE tables_priv ("
-  c_t="$c_t   Host char(60) DEFAULT '' NOT NULL,"
-  c_t="$c_t   Db char(64) DEFAULT '' NOT NULL,"
-  c_t="$c_t   User char(16) DEFAULT '' NOT NULL,"
-  c_t="$c_t   Table_name char(60) DEFAULT '' NOT NULL,"
+  c_t="$c_t   Host char(60) binary DEFAULT '' NOT NULL,"
+  c_t="$c_t   Db char(64) binary DEFAULT '' NOT NULL,"
+  c_t="$c_t   User char(16) binary DEFAULT '' NOT NULL,"
+  c_t="$c_t   Table_name char(60) binary DEFAULT '' NOT NULL,"
   c_t="$c_t   Grantor char(77) DEFAULT '' NOT NULL,"
   c_t="$c_t   Timestamp timestamp(14),"
   c_t="$c_t   Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL,"
@@ -268,11 +268,11 @@ then
   echo "Preparing columns_priv table"
 
   c_c="$c_c CREATE TABLE columns_priv ("
-  c_c="$c_c   Host char(60) DEFAULT '' NOT NULL,"
-  c_c="$c_c   Db char(64) DEFAULT '' NOT NULL,"
-  c_c="$c_c   User char(16) DEFAULT '' NOT NULL,"
-  c_c="$c_c   Table_name char(64) DEFAULT '' NOT NULL,"
-  c_c="$c_c   Column_name char(64) DEFAULT '' NOT NULL,"
+  c_c="$c_c   Host char(60) binary DEFAULT '' NOT NULL,"
+  c_c="$c_c   Db char(64) binary DEFAULT '' NOT NULL,"
+  c_c="$c_c   User char(16) binary DEFAULT '' NOT NULL,"
+  c_c="$c_c   Table_name char(64) binary DEFAULT '' NOT NULL,"
+  c_c="$c_c   Column_name char(64) binary DEFAULT '' NOT NULL,"
   c_c="$c_c   Timestamp timestamp(14),"
   c_c="$c_c   Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL,"
   c_c="$c_c   PRIMARY KEY (Host,Db,User,Table_name,Column_name)"

sql/item_func.h

@@ -520,11 +520,17 @@ public:
   void update_used_tables()
   {
     item->update_used_tables() ; Item_func::update_used_tables();
-    used_tables_cache|=item->used_tables();
+    used_tables_cache|= item->used_tables();
+    const_item_cache&=  item->const_item();
   }
   const char *func_name() const { return "field"; }
   void fix_length_and_dec()
-  { maybe_null=0; max_length=2; used_tables_cache|=item->used_tables();}
+  {
+    maybe_null=0; max_length=3;
+    used_tables_cache|= item->used_tables();
+    const_item_cache&=  item->const_item();
+    with_sum_func= with_sum_func || item->with_sum_func;
+  }
 };
 
 

sql/item_strfunc.cc

@@ -1199,6 +1199,7 @@ void Item_func_elt::fix_length_and_dec()
     set_if_bigger(decimals,args[i]->decimals);
   }
   maybe_null=1;					// NULL if wrong first arg
+  with_sum_func= with_sum_func || item->with_sum_func;
   used_tables_cache|=item->used_tables();
   const_item_cache&=item->const_item();
 }

sql/share/Makefile.am

@@ -23,3 +23,6 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README
 	$(INSTALL_DATA) $(srcdir)/charsets/Index $(DESTDIR)$(pkgdatadir)/charsets/Index
 	$(INSTALL_DATA) $(srcdir)/charsets/*.conf $(DESTDIR)$(pkgdatadir)/charsets
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

sql/sql_select.cc

@@ -3288,7 +3288,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
   KEY_PART_INFO *key_part_info;
   Item_result_field **copy_func;
   MI_COLUMNDEF *recinfo;
-  uint temp_pool_slot;
+  uint temp_pool_slot=MY_BIT_NONE;
 
   DBUG_ENTER("create_tmp_table");
   DBUG_PRINT("enter",("distinct: %d  save_sum_fields: %d  allow_distinct_limit: %d  group: %d",
@@ -3297,18 +3297,15 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
 
   statistic_increment(created_tmp_tables, &LOCK_status);
 
-  if(use_temp_pool) {
+  if (use_temp_pool)
     temp_pool_slot = bitmap_set_next(temp_pool, TEMP_POOL_SIZE);
-    if(temp_pool_slot != MY_BIT_NONE) // we got a slot
+
+  if (temp_pool_slot != MY_BIT_NONE) // we got a slot
     sprintf(path, "%s%s_%lx_%i", mysql_tmpdir, tmp_file_prefix, 
 	    current_pid, temp_pool_slot);
-    else // if we run out of slots in the pool, fall back to old behavior
-      sprintf(path,"%s%s%lx_%lx_%x",mysql_tmpdir,tmp_file_prefix,current_pid,
-              thd->thread_id, thd->tmp_table++);
-  } else {
+  else // if we run out of slots or we are not using tempool
     sprintf(path,"%s%s%lx_%lx_%x",mysql_tmpdir,tmp_file_prefix,current_pid,
             thd->thread_id, thd->tmp_table++);
-  };
 
   if (group)
   {

sql/udf_example.cc

@@ -56,11 +56,13 @@
 **
 ** Function 'myfunc_int' returns summary length of all its arguments.
 **
+** Function 'sequence' returns an sequence starting from a certain number
+**
 ** On the end is a couple of functions that converts hostnames to ip and
 ** vice versa.
 **
 ** A dynamicly loadable file should be compiled sharable
-** (something like: gcc -shared -o udf_example.so myfunc.cc).
+** (something like: gcc -shared -o my_func.so myfunc.cc).
 ** You can easily get all switches right by doing:
 ** cd sql ; make udf_example.o
 ** Take the compile line that make writes, remove the '-c' near the end of
@@ -74,6 +76,7 @@
 ** CREATE FUNCTION metaphon RETURNS STRING SONAME "udf_example.so";
 ** CREATE FUNCTION myfunc_double RETURNS REAL SONAME "udf_example.so";
 ** CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "udf_example.so";
+** CREATE FUNCTION sequence RETURNS INTEGER SONAME "udf_example.so";
 ** CREATE FUNCTION lookup RETURNS STRING SONAME "udf_example.so";
 ** CREATE FUNCTION reverse_lookup RETURNS STRING SONAME "udf_example.so";
 ** CREATE AGGREGATE FUNCTION avgcost RETURNS REAL SONAME "udf_example.so";
@@ -121,6 +124,10 @@ double myfunc_double(UDF_INIT *initid, UDF_ARGS *args, char *is_null,
 		     char *error);
 longlong myfunc_int(UDF_INIT *initid, UDF_ARGS *args, char *is_null,
 		    char *error);
+my_bool sequence_init(UDF_INIT *initid, UDF_ARGS *args, char *message);
+ void sequence_deinit(UDF_INIT *initid);
+long long sequence(UDF_INIT *initid, UDF_ARGS *args, char *is_null,
+		   char *error);
 }
 
 
@@ -535,6 +542,8 @@ double myfunc_double(UDF_INIT *initid, UDF_ARGS *args, char *is_null,
 ** This function should return the result as a long long
 ***************************************************************************/
 
+/* This function returns the sum of all arguments */
+
 long long myfunc_int(UDF_INIT *initid, UDF_ARGS *args, char *is_null,
 		     char *error)
 {
@@ -559,6 +568,50 @@ long long myfunc_int(UDF_INIT *initid, UDF_ARGS *args, char *is_null,
 }
 
 
+/*
+  Simple example of how to get a sequences starting from the first argument
+  or 1 if no arguments have been given
+*/
+
+my_bool sequence_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
+{
+  if (args->arg_count > 1)
+  {
+    strmov(message,"This function takes none or 1 argument");
+    return 1;
+  }
+  if (args->arg_count)
+    args->arg_type[0]= INT_RESULT;		// Force argument to int
+
+  if (!(initid->ptr=(char*) malloc(sizeof(longlong))))
+  {
+    strmov(message,"Couldn't allocate memory");
+    return 1;
+  }
+  bzero(initid->ptr,sizeof(longlong));
+  // Fool MySQL to think that this function is a constant
+  // This will ensure that MySQL only evalutes the function
+  // when the rows are sent to the client and not before any ORDER BY
+  // clauses
+  initid->const_item=1;
+  return 0;
+}
+
+void sequence_deinit(UDF_INIT *initid)
+{
+  if (initid->ptr)
+    free(initid->ptr);
+}
+
+long long sequence(UDF_INIT *initid, UDF_ARGS *args, char *is_null,
+		   char *error)
+{
+  ulonglong val=0;
+  if (args->arg_count)
+    val= *((long long*) args->args[0]);
+  return ++ *((longlong*) initid->ptr) + val;
+}
+
 /****************************************************************************
 ** Some functions that handles IP and hostname conversions
 ** The orignal function was from Zeev Suraski.