1. 02 Jun, 2005 14 commits
    • unknown's avatar
      misc. fixes for windoze builds · 1dd50e46
      unknown authored
      
      VC++Files/client/mysql.dsp:
        added missing mysys.lib
      VC++Files/client/mysqladmin.dsp:
        added missing mysys.lib
      VC++Files/client/mysqlimport.dsp:
        added missing mysys.lib
      VC++Files/client/mysqlshow.dsp:
        added missing mysys.lib
      VC++Files/libmysql/libmysql.dsp:
        added missing mysys.lib
      VC++Files/mysql.dsw:
        added dependencies on mysys
      include/config-win.h:
        added missing constant
      sql/sql_base.cc:
        pulled declaration of table_list out of for-scope
      1dd50e46
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1.sysvar · a6cf849e
      unknown authored
      into mysql.com:/usr/home/bar/mysql-5.0
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      a6cf849e
    • unknown's avatar
      item_func.cc: · 17678a7b
      unknown authored
      set_var.cc:
      variables.result
      variables.test
      
        Bug #10904 Illegal mix of collations between a system variable and a constant
        Changing coercibility of system variables to SYSCONST,
        to be the same with USER(), DATABASE(), etc.
      
      
      sql/item_func.cc:
        Bug #10904 Illegal mix of collations between a system variable and a constant
        Changing coercibility of system variables to SYSCONST
        To be the same with USER(), DATABASE(), etc.
      17678a7b
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1-4100 · 198550e3
      unknown authored
      into mysql.com:/home/mydev/mysql-5.0-5000
      
      
      mysys/mf_keycache.c:
        Auto merged
      198550e3
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · d7d3be6b
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      
      d7d3be6b
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · a923940c
      unknown authored
      into zim.(none):/home/brian/mysql/mysql-5.0
      
      
      BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
        Auto merged
      BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
        Auto merged
      client/sql_string.cc:
        Auto merged
      mysys/raid.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_blackhole.cc:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_geofunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_uniq.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/procedure.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/protocol_cursor.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_analyse.cc:
        Auto merged
      sql/examples/ha_archive.cc:
        Auto merged
      sql/examples/ha_example.cc:
        Auto merged
      sql/examples/ha_tina.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_map.cc:
        Auto merged
      sql/sql_olap.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      a923940c
    • unknown's avatar
      Merge of 4.1->5.0. This contained the fixes for GCC 4.0 · f629af60
      unknown authored
      
      BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
        Auto merged
      BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
        Auto merged
      client/mysqladmin.cc:
        Auto merged
      client/sql_string.cc:
        Auto merged
      mysys/raid.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_blackhole.cc:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_geofunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_uniq.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/procedure.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/protocol_cursor.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_analyse.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/examples/ha_example.cc:
        Auto merged
      sql/examples/ha_tina.cc:
        Auto merged
      sql/sql_map.cc:
        Auto merged
      sql/sql_olap.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      sql/examples/ha_archive.cc:
        Merge fix
      sql/mysqld.cc:
        Hand merge
      sql/opt_range.cc:
        Hand Merge
      sql/sql_acl.cc:
        Hand Merge
      f629af60
    • unknown's avatar
      Merge · bda8d58d
      unknown authored
      
      BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
        Auto merged
      BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
        Auto merged
      client/sql_string.cc:
        Auto merged
      mysys/raid.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_blackhole.cc:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_geofunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_uniq.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/procedure.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/protocol_cursor.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_analyse.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_map.cc:
        Auto merged
      sql/sql_olap.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/examples/ha_archive.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      sql/examples/ha_example.cc:
        Auto merged
      sql/examples/ha_tina.cc:
        Auto merged
      bda8d58d
    • unknown's avatar
      Merge · e2bf6b04
      unknown authored
      
      sql/ha_heap.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/examples/ha_archive.cc:
        Auto merged
      sql/examples/ha_example.cc:
        Auto merged
      sql/examples/ha_tina.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_repl.cc:
        SCCS merged
      e2bf6b04
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 288008ea
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      BUILD/SETUP.sh:
        Merge from 4.1
      288008ea
    • unknown's avatar
      Restore a bit of code accidently deleted during merge · c0df79f9
      unknown authored
      
      sql/item_func.cc:
        Restore accidently deleted code
      c0df79f9
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · e71ef941
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      sql/item_func.cc:
        Auto merged
      e71ef941
    • unknown's avatar
      tztime.cc: · cee10f97
      unknown authored
        Set #pragma implementation" earlier
      Many files:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      
      
      client/sql_string.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      mysys/raid.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/field.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/ha_berkeley.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/ha_blackhole.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/ha_heap.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/ha_innodb.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/ha_isam.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/ha_isammrg.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/ha_myisam.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/ha_myisammrg.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/ha_ndbcluster.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/handler.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/hash_filo.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/item.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/item_cmpfunc.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/item_func.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/item_geofunc.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/item_strfunc.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/item_subselect.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/item_sum.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/item_timefunc.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/item_uniq.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/log_event.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/opt_range.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/procedure.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/protocol.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/protocol_cursor.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/set_var.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/sql_analyse.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/sql_class.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/sql_crypt.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/sql_list.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/sql_map.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/sql_olap.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/examples/ha_archive.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/sql_select.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/sql_string.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/sql_udf.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/examples/ha_example.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/examples/ha_tina.cc:
        Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
      sql/tztime.cc:
        Set #pragma implementation" earlier
      cee10f97
    • unknown's avatar
      Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed... · 0218ecf7
      unknown authored
      Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
      
      
      client/mysqladmin.cc:
        gcc 4.0 fix
      sql/examples/ha_archive.cc:
        Bunch of little cleanups from -Wall and gcc 4.0 fixes
      sql/examples/ha_example.cc:
        Noticed that the error call was not quite right.
      sql/examples/ha_tina.cc:
        Bunch of cleanups (many of which were quite dumb of me... and I have no earthly idea how they missed everyone's notice).
      sql/ha_heap.cc:
        Removed unused variable (-Wall find)
      sql/item_subselect.cc:
        Removed unused label.
      sql/mysqld.cc:
        Cleanup of unused function and gcc 4.0 bit.
      sql/opt_range.h:
        Cleanup for gcc 4.0
      sql/repl_failsafe.cc:
        Cleanup for gcc 4.0
      sql/slave.cc:
        Cleanup for gcc 4.0
      sql/sql_acl.cc:
        Cleanup for gcc 4.0
      sql/sql_insert.cc:
        Cleanedup for gcc 4.0
      sql/sql_parse.cc:
        Cleanedup for gcc 4.0
      sql/sql_repl.cc:
        Removed unused variable
      sql/sql_select.cc:
        Cleanedup for gcc 4.0
      0218ecf7
  2. 01 Jun, 2005 26 commits