• unknown's avatar
    Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 82b10338
    unknown authored
    into  mysql.com:/home/tnurnberg/15327/51-15327
    
    
    configure.in:
      Auto merged
    client/mysql.cc:
      Auto merged
    client/mysql_upgrade.c:
      Auto merged
    client/mysqladmin.cc:
      Auto merged
    client/mysqlbinlog.cc:
      Auto merged
    client/mysqlcheck.c:
      Auto merged
    client/mysqldump.c:
      Auto merged
    client/mysqlimport.c:
      Auto merged
    client/mysqlshow.c:
      Auto merged
    client/mysqltest.c:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    mysql-test/Makefile.am:
      Auto merged
    mysql-test/mysql-test-run-shell.sh:
      Auto merged
    scripts/Makefile.am:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    tests/mysql_client_test.c:
      Auto merged
    82b10338
mysqlimport.c 21 KB