Commit c1a06748 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents 18004dc7 cf84a095

dbug/dbug.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ struct settings { 


static BOOLEAN init_done= FALSE; /* Set to TRUE when initialization done */

static struct settings init_settings;

static char *db_process= 0;     /* Pointer to process name; argv[0] */

static const char *db_process= 0;/* Pointer to process name; argv[0] */



typedef struct _db_code_state_ {

  const char *process;          /* Pointer to process name; usually argv[0] */

mysql-test/r/ndb_restore.result

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ create table t8 engine=myisam as select * from t8_c; 
create table t9 engine=myisam as select * from t9_c;

CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;

DELETE FROM test.backup_info;

LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';

LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';

SELECT @the_backup_id:=backup_id FROM test.backup_info;

@the_backup_id:=backup_id

<the_backup_id>
@@ -250,7 +250,7 @@ ALTER TABLE t7_c 
PARTITION BY LINEAR KEY (`dardtestard`);

CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;

DELETE FROM test.backup_info;

LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';

LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';

SELECT @the_backup_id:=backup_id FROM test.backup_info;

@the_backup_id:=backup_id

<the_backup_id>