• unknown's avatar
    After merge fixes · af8301ce
    unknown authored
    Add support for warnings for prepare of prepared statements
    Fixed test to work with --ps-protocol
    Fixed some test results
    
    
    libmysql/libmysql.c:
      Add support for warnings for prepare of prepared statements
    mysql-test/r/func_concat.result:
      After merge fixes
    mysql-test/r/select.result:
      Delete conflicting tables form previous tests
    mysql-test/r/view.result:
      New code from 4.1 fixed old error
    mysql-test/t/create.test:
      Ensure that --ps-protocol return same results as normal test
    mysql-test/t/func_group.test:
      Remove not needed --disable_ps_protocol
    mysql-test/t/func_time.test:
      Ensure that --ps-protocol return same results as normal test
    mysql-test/t/having.test:
      Ensure that --ps-protocol return same results as normal test
    mysql-test/t/insert_select.test:
      Remove not needed --disable_ps_protocol
    mysql-test/t/select.test:
      Ensure that --ps-protocol return same results as normal test
    mysql-test/t/sp.test:
      Fixed comment
    mysql-test/t/system_mysql_db_fix.test:
      Fix that results is same as from system_mysql_db.test
    mysql-test/t/trigger.test:
      Added comment
    mysql-test/t/type_blob.test:
      Remove not needed --disable_ps_protocol
    mysql-test/t/union.test:
      Run most of the test with --ps-protocol
    mysql-test/t/user_limits.test:
      Ensure that --ps-protocol return same results as normal test
    mysql-test/t/view.test:
      Removed --error as bug is now fixed
    mysql-test/t/warnings.test:
      Ensure that --ps-protocol return same results as normal test
    ndb/include/Makefile.am:
      Don't automaticly use SCCS files
    sql/ha_ndbcluster.cc:
      Removed compiler warning
    sql/log_event.cc:
      After merge fix
    sql/sql_class.h:
      After merge fix
    sql/sql_insert.cc:
      After merge fix
    sql/sql_load.cc:
      After merge fix
    sql/sql_prepare.cc:
      Add support for warnings for prepare of prepared statements
    sql/sql_update.cc:
      After merge fixes
    af8301ce
sql_load.cc 28.6 KB