Commit 9ddd5d89 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint
parents 7d1fefea 3ec0c5c5

.bzrignore

+14 −0
Original line number Diff line number Diff line
@@ -1255,6 +1255,7 @@ mysql-test/mysql-test-run-shell 
mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new

mysql-test/ndb/ndbcluster

mysql-test/partitions.log

mysql-test/r/*.err

mysql-test/r/*.log

mysql-test/r/*.out
@@ -1334,8 +1335,21 @@ mysql-test/r/symlink.log 
mysql-test/r/system_mysql_db.log

mysql-test/r/tmp.result

mysql-test/r/udf.log

mysql-test/rpl.log

mysql-test/share/mysql

mysql-test/std_data/*.pem

mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings

mysql-test/suite/funcs_1/r/innodb_views.warnings

mysql-test/suite/funcs_1/r/memory_trig_03e.warnings

mysql-test/suite/funcs_1/r/memory_views.warnings

mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings

mysql-test/suite/funcs_1/r/myisam_views.warnings

mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings

mysql-test/suite/funcs_1/r/ndb_views.warnings

mysql-test/suite/partitions/r/diff

mysql-test/suite/partitions/r/partition_bit_ndb.warnings

mysql-test/suite/partitions/r/partition_special_innodb.warnings

mysql-test/suite/partitions/r/partition_special_myisam.warnings

mysql-test/t/index_merge.load

mysql-test/t/tmp.test

mysql-test/var

BitKeeper/etc/collapsed

+2 −0
Original line number Diff line number Diff line
@@ -42,3 +42,5 @@ 
45ba4faf2oqu6eR8fqecR3LfSNcYUg

45ba5238-NKl80QVXzdGo8hO9M75Xg

45c0fdfb2mz6NdOIsLenJtf6_ZelTA

45d1ffcd-r3v8A7uh92hQaMfQM9UPQ

45d21437Vg_-i4uOWyvzYWHESXDP6A

BitKeeper/etc/gone

+6 −0
Original line number Diff line number Diff line
@@ -458,6 +458,12 @@ ccarkner@nslinuxw10.bedford.progress.com|mysql-test/t/isolation.test|20010327145 
fs

holyfoot/hf@mysql.com/deer.(none)|mysql-test/r/bdb_notembedded.result|20061113160642|60022|276fa5181da9a588

holyfoot/hf@mysql.com/deer.(none)|mysql-test/t/bdb_notembedded.test|20061113160642|06094|6ef2ea4713496614

jani@a88-113-38-195.elisa-laajakaista.fi|BUILD/SETUP.sh.rej|20070122013357|30052|b0650da46e7c4e54

jani@a88-113-38-195.elisa-laajakaista.fi|configure.in.rej|20070122013357|43533|4b7ec608b9c90e83

jani@a88-113-38-195.elisa-laajakaista.fi|include/my_global.h.rej|20070122013357|29911|dc7f1642f6061af

jani@a88-113-38-195.elisa-laajakaista.fi|include/my_pthread.h.rej|20070122013357|18348|a6b632d992e5df16

jani@a88-113-38-195.elisa-laajakaista.fi|mysys/thr_alarm.c.rej|20070122013357|21935|c169568388079966

jani@a88-113-38-195.elisa-laajakaista.fi|sql/mysqld.cc.rej|20070122013357|09337|84aad00c2111bc3

jani@hynda.mysql.fi|client/mysqlcheck|20010419221207|26716|363e3278166d84ec

jcole@tetra.bedford.progress.com|BitKeeper/etc/logging_ok|20001004201211|30554

jimw@mysql.com|mysql-test/t/ndb_alter_table.disabled|20050311230559|27526|411e026940e7a0aa

client/mysqltest.c

+28 −0
Original line number Diff line number Diff line
@@ -417,6 +417,8 @@ void verbose_msg(const char *fmt, ...) 
  ATTRIBUTE_FORMAT(printf, 1, 2);

void warning_msg(const char *fmt, ...)

  ATTRIBUTE_FORMAT(printf, 1, 2);

void log_msg(const char *fmt, ...)

  ATTRIBUTE_FORMAT(printf, 1, 2);



VAR* var_from_env(const char *, const char *);

VAR* var_init(VAR* v, const char *name, int name_len, const char *val,
@@ -579,6 +581,7 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query, 
	dynstr_append_mem(query_eval, p, 1);

      break;

    default:

      escaped= 0;

      dynstr_append_mem(query_eval, p, 1);

      break;

    }
@@ -943,6 +946,25 @@ void warning_msg(const char *fmt, ...) 
}





void log_msg(const char *fmt, ...)

{

  va_list args;

  char buff[512];

  size_t len;

  DBUG_ENTER("log_msg");



  memset(buff, 0, sizeof(buff));

  va_start(args, fmt);

  len= vsnprintf(buff, sizeof(buff)-1, fmt, args);

  va_end(args);



  dynstr_append_mem(&ds_res, buff, len);

  dynstr_append(&ds_res, "\n");



  DBUG_VOID_RETURN;

}





/*

  Compare content of the string ds to content of file fname

*/
@@ -1614,7 +1636,11 @@ void do_exec(struct st_command *command) 
    my_bool ok= 0;



    if (command->abort_on_error)

    {

      log_msg("exec of '%s failed, error: %d, status: %d, errno: %d",

              ds_cmd.str, error, status, errno);

      die("command \"%s\" failed", command->first_argument);

    }



    DBUG_PRINT("info",

               ("error: %d, status: %d", error, status));
@@ -1638,6 +1664,8 @@ void do_exec(struct st_command *command) 
           command->expected_errors.err[0].code.errnum != 0)

  {

    /* Error code we wanted was != 0, i.e. not an expected success */

    log_msg("exec of '%s failed, error: %d, errno: %d",

            ds_cmd.str, error, errno);

    die("command \"%s\" succeeded - should have failed with errno %d...",

        command->first_argument, command->expected_errors.err[0].code.errnum);

  }

mysql-test/include/mix1.inc

+29 −0
Original line number Diff line number Diff line
@@ -387,6 +387,35 @@ EXPLAIN SELECT b, SUM(c) FROM t1 GROUP BY b; 
EXPLAIN SELECT SQL_BIG_RESULT b, SUM(c) FROM t1 GROUP BY b;

DROP TABLE t1;



#

# Bug#26159: crash for a loose scan of a table that has been emptied 

#



CREATE TABLE t1 (

  id int NOT NULL,

  name varchar(20) NOT NULL,

  dept varchar(20) NOT NULL,

  age tinyint(3) unsigned NOT NULL,

  PRIMARY KEY (id),

  INDEX (name,dept)

) ENGINE=InnoDB;

INSERT INTO t1(id, dept, age, name) VALUES

  (3987, 'cs1', 10, 'rs1'), (3988, 'cs2', 20, 'rs1'), (3995, 'cs3', 10, 'rs2'),

  (3996, 'cs4', 20, 'rs2'), (4003, 'cs5', 10, 'rs3'), (4004, 'cs6', 20, 'rs3'),

  (4011, 'cs7', 10, 'rs4'), (4012, 'cs8', 20, 'rs4'), (4019, 'cs9', 10, 'rs5'),

  (4020, 'cs10', 20, 'rs5'),(4027, 'cs11', 10, 'rs6'),(4028, 'cs12', 20, 'rs6');



EXPLAIN SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';

SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';

DELETE FROM t1;

EXPLAIN SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';

SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';



DROP TABLE t1;



--source include/innodb_rollback_on_timeout.inc



--echo End of 5.0 tests

#

# Test of behaviour with CREATE ... SELECT

#