• unknown's avatar
    Last part of resolving conflicts after pull · 0451af65
    unknown authored
    Some intersections with Monty encountered
    
    
    libmysql/client_settings.h:
      We don't need the trick with macroses since Monty moved cli_mysql_use_result
      into sql-common/client.c
    libmysql/libmysql.c:
      mysql_use_result moved in sql-common/client.c
    sql-common/client.c:
      code simplified with the moving of mysql_use_result here
    sql/client_settings.h:
      we don't need this #define anymore
    sql/sql_client.cc:
      this function was moved to sql-common/pack.c by me
      i think the pack.c is the better place for it
    0451af65
client_settings.h 1.32 KB