1. 02 Aug, 2005 1 commit
  2. 01 Aug, 2005 5 commits
  3. 31 Jul, 2005 12 commits
    • unknown's avatar
      After merge fixes · a560a9f3
      unknown authored
      Review of new pushed code
      
      
      client/mysqlbinlog.cc:
        After merge fixes
      sql/set_var.cc:
        After merge fixes
      sql/sql_select.cc:
        Removed not needed test (field->maybe_null() also tests field->table->maybe_null)
      a560a9f3
    • unknown's avatar
      Fix for bug#12021 · 35fd6415
      unknown authored
      35fd6415
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4dbc076e
      unknown authored
      into  mishka.local:/home/my/mysql-5.0
      
      
      sql/sql_select.cc:
        Auto merged
      4dbc076e
    • unknown's avatar
      Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2fa55b0a
      unknown authored
      into  alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0
      
      
      sql/sql_select.cc:
        Auto merged
      2fa55b0a
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 · 9cd0ecc8
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      mysql-test/r/null_key.result:
        Auto merged
      mysql-test/t/null_key.test:
        Auto merged
      9cd0ecc8
    • unknown's avatar
      null_key.result, null_key.test: · 846277d8
      unknown authored
        Modified test case for bug #12144.
      
      
      mysql-test/t/null_key.test:
        Modified test case for bug #12144.
      mysql-test/r/null_key.result:
        Modified test case for bug #12144.
      846277d8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e43a6096
      unknown authored
      into  mishka.local:/home/my/mysql-5.0
      
      
      mysql-test/t/sp.test:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      client/client_priv.h:
        Simple merge
      client/mysqldump.c:
        Simple merge
      mysql-test/r/variables.result:
        Simple merge
      mysql-test/t/variables.test:
        Simple merge
      sql/sql_trigger.cc:
        Simple merge
      e43a6096
    • unknown's avatar
      Fixes during review of new pushed code · 6b3478ec
      unknown authored
      Change bool in C code to my_bool
      Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
      Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
      
      
      client/client_priv.h:
        Added OPT_TRIGGERS (to get rid of compiler warning)
      client/mysql.cc:
        Added cast to get rid of compiler warning
      client/mysqldump.c:
        Added OPT_TRIGGERS (to get rid of compiler warning)
        Abort if we can't write to outfile (even if --ignore-errors is given)
      client/mysqltest.c:
        Added --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
      include/my_sys.h:
        Make my_progname const
      include/my_time.h:
        Avoid using 'bool' in C programs
      mysql-test/lib/init_db.sql:
        Align with mysql_create_system_tables
        (Ideally this file should be auto-generated from the above script)
      mysql-test/r/mysqltest.result:
        Test for --enable_parsing
      mysql-test/r/variables.result:
        Update results after fix for overflow checking of max_heap_table_size
      mysql-test/t/information_schema.test:
        USe --enable/disable parsing instead of comments
      mysql-test/t/mysqltest.test:
        Test for --enable_parsing
      mysql-test/t/sp.test:
        USe --enable/disable parsing instead of comments
      mysql-test/t/variables.test:
        Portability fix for 64 bit systems
      mysql-test/t/view.test:
        USe --enable/disable parsing instead of comments
      mysys/my_init.c:
        May my_progname const
      mysys/my_static.c:
        May my_progname const
      mysys/thr_lock.c:
        Remove not needed casts
      sql-common/my_time.c:
        Change bool -> my_bool as bool is not portable in C programs
      sql/field.cc:
        Test number_to_datetime() for -1 instead of < 0 (Safety fix)
        New prototype for TIME_to_timestamp()
      sql/item.h:
        Don't have prototypes for both uint32 and ulong as these 'may' be the same thing
      sql/item_timefunc.cc:
        New prototype for TIME_to_timestamp()
      sql/log.cc:
        Remove compiler warnings
      sql/mysql_priv.h:
        New prototype for TIME_to_timestamp()
        Added function for comparing LEX_STRING
      sql/set_var.cc:
        Added overflow checking when setting ulong variable
      sql/sql_base.cc:
        Added function is_equal()
        Changed strncmp -> is_equal() as strncmp() to not match "V" (instead of "VIEW")
      sql/sql_class.cc:
        Added comment
      sql/sql_select.cc:
        Portability fixes
        After review fixes
      sql/sql_trigger.cc:
        Use 'tables_alias_charset' for comparing database name
        Use 'is_equal()' to compare file type. (Old code didn't do the comparison correctly)
      sql/sql_view.cc:
        Use 'is_equal()' to compare file type. (Old code didn't do the comparison correctly)
      sql/time.cc:
        New prototype for TIME_to_timestamp() to allow easyer mapping to C function
      sql/tztime.cc:
        bool -> my_bool (to allow calling C code from C++ code)
      sql/tztime.h:
        bool -> my_bool (to allow calling C code from C++ code)
      6b3478ec
    • unknown's avatar
      Merge · 6c40ce76
      unknown authored
      
      VC++Files/client/mysqlclient_ia64.dsp:
        Auto merged
      include/config-win.h:
        Auto merged
      sql/item_sum.cc:
        SCCS merged
      6c40ce76
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 83304cd0
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      83304cd0
    • unknown's avatar
      Fixed bug #12095: a join query with GROUP_CONCAT over a single row table. · 2f47bc19
      unknown authored
      If GROUP_CONCAT is calculated we always put its argument into a temp
      table, even when the argument is a constant item.
      
      
      
      2f47bc19
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 629d59a8
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      629d59a8
  4. 30 Jul, 2005 2 commits
  5. 29 Jul, 2005 20 commits
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8867beec
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      
      8867beec
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 7dafc733
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      mysql-test/r/mysqldump.result:
        merge
      sql/sql_trigger.cc:
        merge
      7dafc733
    • unknown's avatar
      Added sql_mode saving to mysql_dump (BUG#5891, part 2) · 675c4bb4
      unknown authored
      
      client/client_priv.h:
        add OPT_ for --trigger parameter
      client/mysqldump.c:
        fixed short simbol for trigger
        fixed lines break for more compiler compatibility
        added sql_mode output
        added comments
        made protection of trigger and view restoring commands from execution by old versions of mysql
      mysql-test/r/mysqldump.result:
        changed test, to test sql_mode
      mysql-test/r/sp.result:
        now sql_mode preserved in SP
      mysql-test/t/mysqldump.test:
        changed test, to test sql_mode
      mysql-test/t/sp.test:
        now sql_mode preserved in SP
      sql/set_var.cc:
        fixed comment
      675c4bb4
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-10351 · c7908e78
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/t/select_safe.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      c7908e78
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 243e9f32
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      
      sql/sql_prepare.cc:
        Auto merged
      243e9f32
    • unknown's avatar
      fixed two bugs that break Windows build · b66ffdcb
      unknown authored
      
      libmysql/libmysql.def:
        "get_defaults_files" has been renamed to "get_defaults_options"
        but was not removed here
      sql/sql_select.cc:
        pulled variable out of for() scope to satisfy dumb MSVC6 compiler
      b66ffdcb
    • unknown's avatar
      fix for bug#12665 · 52dfa3b8
      unknown authored
      macro floatget was missing in config-win.h
      
      
      52dfa3b8
    • unknown's avatar
      - fixed a typo in C++Files/client/mysqlclient_ia64.dsp: ctype-cp963.c -> ctype-cp932.c · 8cec8458
      unknown authored
        (thanks to JoergB for spotting it)
      
      
      VC++Files/client/mysqlclient_ia64.dsp:
        - fixed a typo: ctype-cp963.c -> ctype-cp932.c (thanks to JoergB for spotting it)
      8cec8458
    • unknown's avatar
      Fix for bug #12173 (show create table crash) · 68cd99bd
      unknown authored
      
      mysql-test/r/type_newdecimal.result:
        test result fixed
      mysql-test/t/type_newdecimal.test:
        testcase
      strings/decimal.c:
        we always add one int-part digit even if decimal(10,10) (no int part declared)
      68cd99bd
    • unknown's avatar
      Manual merge · df7e030b
      unknown authored
      df7e030b
    • unknown's avatar
      Manual merge · 48abe1d6
      unknown authored
      
      configure.in:
        Auto merged
      mysql-test/r/null_key.result:
        Auto merged
      mysql-test/t/null_key.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      48abe1d6
    • unknown's avatar
      func_gconcat.result, func_gconcat.test: · 21d2fb62
      unknown authored
        Added a test case for bug #12095.
      sql_class.h:
        Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
        Added a flag to the TMP_TABLE_PARAM class forcing to put constant
        items generated after elimination of a single row table into temp table
        in some cases (e.g. when GROUP_CONCAT is calculated over a single row
        table).
        bk ci sql/item_sum.cc
        Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
        If GROUP_CONCAT is calculated we always put its argument into a temp
        table, even when the argument is a constant item.
      sql_select.cc:
        Fixed bug #12095: a join query with GROUP_CONCAT over one row table.
        If temp table is used to calculate GROUP_CONCAT the argument should
        be always put into this table, even when it is a constant item.
      
      
      sql/sql_select.cc:
        Fixed bug #12095: a join query with GROUP_CONCAT over one row table.
        If temp table is used to calculate GROUP_CONCAT the argument should
        be always put into this table, even when it is a constant item.
      sql/sql_class.h:
        Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
        Added a flag to the TMP_TABLE_PARAM class forcing to put constant
        items generated after elimination of a single row table into temp table
        in some cases (e.g. when GROUP_CONCAT is calculated over a single row
        table).
        bk ci sql/item_sum.cc
        Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
        If GROUP_CONCAT is calculated we always put its argument into a temp
        table, even when the argument is a constant item.
      mysql-test/t/func_gconcat.test:
        Added a test case for bug #12095.
      mysql-test/r/func_gconcat.result:
        Added a test case for bug #12095.
      21d2fb62
    • unknown's avatar
      Ensure we free all items for prepared statements · 90b2daa7
      unknown authored
      Before the fix in ~Prepared_statments we got a memory leak when executing mysql_client_test.test
      Note that test 'variables.test' fails.
      This will be fixed when Jimw pushes the fix for Bug 10351
      
      
      mysys/default.c:
        Fixed typo
      sql/item.cc:
        More debugging information
      sql/sql_prepare.cc:
        More debugging information
        Ensure we free all items for prepared statements
        Before the fix in ~Prepared_statments we got a memory leak when executing mysql_client_test.test
      90b2daa7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 833a5ce0
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      833a5ce0
    • unknown's avatar
    • unknown's avatar
      Fix for handling of unsigned long options on 32-bit platforms that · 120e80f1
      unknown authored
      allowed unintended overflows. (Bug #10351)
      
      
      mysql-test/r/select_safe.result:
        Update results
      mysql-test/r/variables.result:
        Update results
      mysql-test/t/select_safe.test:
        Remove "SELECT @@MAX_SEEKS_FOR_KEY;" because it depends on
        size of unsigned long of the system.
      mysql-test/t/variables.test:
        Fix test for #10351 to test the actual problem
      sql/mysqld.cc:
        Undo unnecessary change to default and max of max_seeks_for_key
      sql/set_var.cc:
        On platforms where SIZEOF_LONG != SIZEOF_LONGLONG, make sure to handle
        max values for ulong-sized options correctly.
      120e80f1
    • unknown's avatar
      null_key.test, null_key.result: · 0ad1836d
      unknown authored
        Made the test case for bug #12144 independent on other tests.
      
      
      mysql-test/r/null_key.result:
        Made the test case for bug #12144 independent on other tests.
      mysql-test/t/null_key.test:
        Made the test case for bug #12144 independent on other tests.
      0ad1836d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ab5023d8
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      mysql-test/t/variables.test:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      ab5023d8
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8db171df
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-28jul-look
      
      
      8db171df
    • unknown's avatar