Commit 037b0a7b authored by unknown's avatar unknown
Browse files

Merge with 4.0 


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/outfile2.result:
  Merge rename: mysql-test/r/outfile.result -> mysql-test/r/outfile2.result
myisam/mi_key.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/handler.h:
  Auto merged
mysql-test/t/alter_table.test:
  Merge
mysql-test/t/outfile.test:
  Merge
sql/item_func.cc:
  Merge
sql/share/czech/errmsg.txt:
  Merge
sql/share/danish/errmsg.txt:
  Merge
sql/share/dutch/errmsg.txt:
  Merge
sql/share/english/errmsg.txt:
  Merge
sql/share/estonian/errmsg.txt:
  Merge
sql/share/french/errmsg.txt:
  Merge
sql/share/german/errmsg.txt:
  Merge
sql/share/greek/errmsg.txt:
  Merge
sql/share/hungarian/errmsg.txt:
  Merge
sql/share/italian/errmsg.txt:
  Merge
sql/share/japanese/errmsg.txt:
  Merge
sql/share/korean/errmsg.txt:
  Merge
sql/share/norwegian-ny/errmsg.txt:
  Merge
sql/share/norwegian/errmsg.txt:
  Merge
sql/share/polish/errmsg.txt:
  Merge
sql/share/portuguese/errmsg.txt:
  Merge
sql/share/romanian/errmsg.txt:
  Merge
sql/share/russian/errmsg.txt:
  Merge
sql/share/slovak/errmsg.txt:
  Merge
sql/share/spanish/errmsg.txt:
  Merge
sql/share/swedish/errmsg.txt:
  Merge
sql/share/ukrainian/errmsg.txt:
  Merge
sql/sql_table.cc:
  Merge
sql/sql_yacc.yy:
  Keep old
sql/unireg.cc:
  Merge
parents 04890a2e cdd6bc9b

man/mysqldump.1.in

+2 −1
Original line number Diff line number Diff line
@@ -218,7 +218,8 @@ or 
), mysqldump will create rows up to net_buffer_length length. If you increase this variable, you should also ensure that the max_allowed_packet variable in the MySQL server is bigger than the net_buffer_length. 

.SH EXAMPLES

.TP

The most normal use of mysqldump is probably for making a backup of whole databases. See Mysql Manual section 21.2 Database Backups. 

The most normal use of mysqldump is probably for making a backup of whole

databases. See the section on Database Backups in the MySQL Reference Manual. 

.TP

mysqldump  \-\-opt \fP\fIdatabase\fP > backup-file.sql

.TP

myisam/mi_key.c

+21 −10
Original line number Diff line number Diff line
@@ -301,8 +301,25 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old, 
} /* _mi_pack_key */





	/* Put a key in record */

	/* Used when only-keyread is wanted */



/*

  Store found key in record



  SYNOPSIS

    _mi_put_key_in_record()

    info		MyISAM handler

    keynr		Key number that was used

    record 		Store key here



    Last read key is in info->lastkey



 NOTES

   Used when only-keyread is wanted



 RETURN

   0   ok

   1   error

*/



static int _mi_put_key_in_record(register MI_INFO *info, uint keynr,

				 byte *record)
@@ -313,14 +330,8 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr, 
  byte *blob_ptr;

  DBUG_ENTER("_mi_put_key_in_record");



  if (info->s->base.blobs && info->s->keyinfo[keynr].flag & HA_VAR_LENGTH_KEY)

  {

    if (!(blob_ptr=

	  mi_alloc_rec_buff(info, info->s->keyinfo[keynr].keylength,

			    &info->rec_buff)))

      goto err;

  }

  key=(byte*) info->lastkey;

  blob_ptr= info->lastkey2;                     /* Place to put blob parts */

  key=(byte*) info->lastkey;                    /* KEy that was read */

  key_end=key+info->lastkey_length;

  for (keyseg=info->s->keyinfo[keynr].seg ; keyseg->type ;keyseg++)

  {

mysql-test/include/have_outfile.inc

0 → 100644
+5 −0
Original line number Diff line number Diff line 
-- require r/have_outfile.require

disable_query_log;

select load_file(concat(@tmpdir,"/outfile.test"));

--exec rm $MYSQL_TEST_DIR/var/tmp/outfile.test

enable_query_log;

mysql-test/include/test_outfile.inc

0 → 100644
+1 −0
Original line number Diff line number Diff line 
eval select "Outfile OK" into outfile "$MYSQL_TEST_DIR/var/tmp/outfile.test";

mysql-test/r/alter_table.result

+36 −0
Original line number Diff line number Diff line
@@ -489,3 +489,39 @@ create table t1 ( a timestamp ); 
alter table t1 add unique ( a(1) );

ERROR HY000: Incorrect sub part key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique sub keys

drop table t1;

drop table if exists t1, t2;

create table t1 ( a varchar(10) not null primary key ) engine=myisam;

create table t2 ( a varchar(10) not null primary key ) engine=merge union=(t1);

flush tables;

alter table t1 modify a varchar(10);

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` varchar(10) NOT NULL default '',

  PRIMARY KEY  (`a`)

) TYPE=MRG_MyISAM UNION=(t1)

flush tables;

alter table t1 modify a varchar(10) not null;

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` varchar(10) NOT NULL default '',

  PRIMARY KEY  (`a`)

) TYPE=MRG_MyISAM UNION=(t1)

drop table if exists t1, t2;

create table t1 (a int, b int, c int, d int, e int, f int, g int, h int,i int, primary key (a,b,c,d,e,f,g,i,h)) engine=MyISAM;

insert into t1 (a) values(1);

show table status like 't1';

Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Create_options	Comment

t1	MyISAM	Fixed	1	37	37	X	X	X	X	X	X	X	X	

alter table t1 modify a int;

show table status like 't1';

Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Create_options	Comment

t1	MyISAM	Fixed	1	37	37	X	X	X	X	X	X	X	X	

drop table t1;

create table t1 (a int not null, b int not null, c int not null, d int not null, e int not null, f int not null, g int not null, h int not null,i int not null, primary key (a,b,c,d,e,f,g,i,h)) engine=MyISAM;

insert into t1 (a) values(1);

show table status like 't1';

Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Create_options	Comment

t1	MyISAM	Fixed	1	37	37	X	X	X	X	X	X	X	X	

drop table t1;