• unknown's avatar
    Merge with 3.23 to get fixes for --user and BACKUP TABLE · 012ffb5d
    unknown authored
    
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/deleted/.del-delete.result:
      Delete: mysql-test/r/delete.result
    BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5:
      Auto merged
    client/mysqlbinlog.cc:
      Auto merged
    include/my_sys.h:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    mysql-test/t/delete.test:
      Auto merged
    mysql-test/t/join.test:
      Auto merged
    mysql-test/t/type_datetime.test:
      Auto merged
    mysys/my_copy.c:
      Auto merged
    sql/field.h:
      Auto merged
    sql/opt_range.cc:
      Auto merged
    sql/share/polish/errmsg.txt:
      Auto merged
    sql/sql_rename.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    mysql-test/mysql-test-run.sh:
      merge with 3.23.56
    mysql-test/r/backup.result:
      merge (needs to be updated)
    mysql-test/r/join.result:
      merge (needs to be updated)
    mysql-test/r/type_datetime.result:
      merge (needs to be updated)
    mysql-test/t/backup.test:
      merge with 3.23
    scripts/mysqld_safe.sh:
      Only use first --user option
    sql/ha_myisam.cc:
      Don't let BACKUP TABLE overwrite old files
    sql/log_event.h:
      merge
    sql/mysql_priv.h:
      merge
    sql/mysqld.cc:
      Use first --user option
    sql/slave.cc:
      use local version
    sql/sql_repl.h:
      use local version
    012ffb5d
.bzrignore 11.3 KB