1. 28 Apr, 2008 5 commits
  2. 24 Apr, 2008 1 commit
    • unknown's avatar
      Fix for funcs_1 tests which fail in 5.0.60 · c82f8595
      unknown authored
      This is basically a backport of changes (only a few were missing)
      which were already pushed to 5.0-build and upmerged to
      5.1-build, 6.0-build
      
      
      mysql-test/std_data/funcs_1/innodb_tb1.txt:
        Rename: mysql-test/suite/funcs_1/data/innodb_tb1.txt -> mysql-test/std_data/funcs_1/innodb_tb1.txt
      mysql-test/std_data/funcs_1/innodb_tb2.txt:
        Rename: mysql-test/suite/funcs_1/data/innodb_tb2.txt -> mysql-test/std_data/funcs_1/innodb_tb2.txt
      mysql-test/std_data/funcs_1/innodb_tb3.txt:
        Rename: mysql-test/suite/funcs_1/data/innodb_tb3.txt -> mysql-test/std_data/funcs_1/innodb_tb3.txt
      mysql-test/std_data/funcs_1/innodb_tb4.txt:
        Rename: mysql-test/suite/funcs_1/data/innodb_tb4.txt -> mysql-test/std_data/funcs_1/innodb_tb4.txt
      mysql-test/std_data/funcs_1/memory_tb1.txt:
        Rename: mysql-test/suite/funcs_1/data/memory_tb1.txt -> mysql-test/std_data/funcs_1/memory_tb1.txt
      mysql-test/std_data/funcs_1/memory_tb2.txt:
        Rename: mysql-test/suite/funcs_1/data/memory_tb2.txt -> mysql-test/std_data/funcs_1/memory_tb2.txt
      mysql-test/std_data/funcs_1/memory_tb3.txt:
        Rename: mysql-test/suite/funcs_1/data/memory_tb3.txt -> mysql-test/std_data/funcs_1/memory_tb3.txt
      mysql-test/std_data/funcs_1/memory_tb4.txt:
        Rename: mysql-test/suite/funcs_1/data/memory_tb4.txt -> mysql-test/std_data/funcs_1/memory_tb4.txt
      mysql-test/std_data/funcs_1/myisam_tb1.txt:
        Rename: mysql-test/suite/funcs_1/data/myisam_tb1.txt -> mysql-test/std_data/funcs_1/myisam_tb1.txt
      mysql-test/std_data/funcs_1/myisam_tb2.txt:
        Rename: mysql-test/suite/funcs_1/data/myisam_tb2.txt -> mysql-test/std_data/funcs_1/myisam_tb2.txt
      mysql-test/std_data/funcs_1/myisam_tb3.txt:
        Rename: mysql-test/suite/funcs_1/data/myisam_tb3.txt -> mysql-test/std_data/funcs_1/myisam_tb3.txt
      mysql-test/std_data/funcs_1/myisam_tb4.txt:
        Rename: mysql-test/suite/funcs_1/data/myisam_tb4.txt -> mysql-test/std_data/funcs_1/myisam_tb4.txt
      mysql-test/std_data/funcs_1/t3.txt:
        Rename: mysql-test/suite/funcs_1/data/t3.txt -> mysql-test/std_data/funcs_1/t3.txt
      mysql-test/std_data/funcs_1/t4.txt:
        Rename: mysql-test/suite/funcs_1/data/t4.txt -> mysql-test/std_data/funcs_1/t4.txt
      mysql-test/std_data/funcs_1/t7.txt:
        Rename: mysql-test/suite/funcs_1/data/t7.txt -> mysql-test/std_data/funcs_1/t7.txt
      mysql-test/std_data/funcs_1/t9.txt:
        Rename: mysql-test/suite/funcs_1/data/t9.txt -> mysql-test/std_data/funcs_1/t9.txt
      mysql-test/Makefile.am:
        Correction for location of loadfiles
      mysql-test/std_data/funcs_1/load_file.txt:
        Missing file
      c82f8595
  3. 23 Apr, 2008 1 commit
    • unknown's avatar
      Many files: [Changes done by mleich] · 905594b0
      unknown authored
        Fix for
           Bug#35335 funcs_1: Some tests fail within load_file during
                              pushbuild runs
           Solution: 1. Move files with input data used in load_file,
                        load data etc.
                        from suite/funcs_1/<whatever>
                        to std_data
                     2. Use for testsuite funcs_1 the server option
                        --secure-file-priv=<MYSQLTEST_VARDIR>
                     3. Outfiles have to be stored under MYSQLTEST_VARDIR
        + changes according to WL#4304 Cleanup in funcs_1 tests
          - backport of fixes/improvements made in 5.1 to 5.0
            The differences between scripts in 5.0 and 5.1 cause
            much additional and annoying work during any upmerge.
          - replace error numbers with names
          - improved comments
          - improved formatting
          - Unify storage engine names so that result files for
            storage engine variants do not differ (some tests)
          - remove a script no more used (tests are done in other scripts)
      
      
      BUILD/Makefile.am:
        Test case adjustments
      mysql-test/Makefile.am:
        Test case adjustments
      mysql-test/mysql-test-run.pl:
        Test case adjustments
      mysql-test/suite/funcs_1/README.txt:
        Test case adjustments
      mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/datadict/datadict_load.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/innodb_tb1.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/innodb_tb2.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/innodb_tb3.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/innodb_tb4.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/memory_tb1.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/memory_tb2.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/memory_tb3.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/memory_tb4.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/myisam_tb1.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/myisam_tb2.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/myisam_tb3.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/myisam_tb4.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/include/sp_tb.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_func_view.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_trig_03.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_trig_08.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_trig_09.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/is_columns_innodb.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/is_columns_memory.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/is_columns_myisam.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/is_columns_ndb.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/is_tables_innodb.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/is_tables_memory.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/is_tables_myisam.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/is_tables_ndb.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_func_view.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_trig_0102.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_trig_03.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_trig_0407.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_trig_08.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_trig_09.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/memory_views.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_func_view.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_trig_03.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_trig_08.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_trig_09.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
        Test case adjustments
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Test case adjustments
      mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/is_basics_mixed.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
        Test case adjustments
      mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
        Test case adjustments
      mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/triggers/triggers_03.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/triggers/triggers_08.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/triggers/triggers_09.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/views/func_view.inc:
        Test case adjustments
      mysql-test/suite/funcs_1/views/views_master.inc:
        Test case adjustments
      905594b0
  4. 01 Apr, 2008 2 commits
  5. 31 Mar, 2008 2 commits
  6. 30 Mar, 2008 1 commit
  7. 29 Mar, 2008 3 commits
  8. 28 Mar, 2008 12 commits
    • unknown's avatar
      Merge amd64.(none):/src/mysql-5.0-bugteam · 396b24a5
      unknown authored
      into  amd64.(none):/src/bug26243/my50-bug26243
      
      
      396b24a5
    • unknown's avatar
      Fix tree: · 7021064a
      unknown authored
        1. Use 'dat' extension, because it is handled in Makefile.am;
        2. Fix typo: the bug id is 35469, not 35649.
      
      
      mysql-test/std_data/bug35469.dat:
        Rename: mysql-test/std_data/bug35649.data -> mysql-test/std_data/bug35469.dat
      mysql-test/r/loaddata.result:
        Update result file.
      mysql-test/t/loaddata.test:
        1. Use 'dat' extension, because it is handled in Makefile.am;
        2. Fix typo: the bug id is 35469, not 35649.
      7021064a
    • unknown's avatar
      Merge amd64.(none):/src/mysql-5.0-bugteam · 219c7a2a
      unknown authored
      into  amd64.(none):/src/bug26243/my50-bug26243
      
      
      libmysql/libmysql.c:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      219c7a2a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam · afb4ac45
      unknown authored
      into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt
      
      
      afb4ac45
    • unknown's avatar
      Bug#26243 mysql command line crash after control-c · a9089cf4
      unknown authored
      - Backported the 5.1 DBUG to 5.0.
      - Avoid memory cleanup race on Windows client for CTRL-C
      
      
      client/mysql.cc:
        Bug#26243 mysql command line crash after control-c
        - On Windows, the sigint handler shouldn't call mysql_end
        because the main thread will do so automatically.
        - Remove unnecessary signal call from the sigint handler.
        - Call my_end with proper value.
      dbug/dbug.c:
        Bug#26243 mysql command line crash after control-c
        - Backported the 5.1 DBUG library. The old version uses a non-thread 
        safe global variable 'static struct state *stack'.
      dbug/factorial.c:
        Bug#26243 mysql command line crash after control-c
        - Backported the 5.1 DBUG library. The old version uses a non-thread 
        safe global variable 'static struct state *stack'.
      dbug/user.r:
        Bug#26243 mysql command line crash after control-c
        - Backported the 5.1 DBUG library. The old version uses a non-thread 
        safe global variable 'static struct state *stack'.
      include/my_dbug.h:
        Bug#26243 mysql command line crash after control-c
        - Backported the 5.1 DBUG library. The old version uses a non-thread 
        safe global variable 'static struct state *stack'.
      libmysql/libmysql.c:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      myisam/mi_open.c:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      sql/ha_federated.cc:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      sql/ha_innodb.cc:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      sql/ha_myisammrg.cc:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      sql/item_cmpfunc.cc:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      sql/mysqld.cc:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      sql/net_serv.cc:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      sql/opt_range.cc:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      sql/set_var.cc:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      sql/slave.cc:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      sql/sql_cache.cc:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      sql/sql_select.cc:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      tests/mysql_client_test.c:
        Bug#26243 mysql command line crash after control-c
        - Update for new DBUG library.
      a9089cf4
    • unknown's avatar
      Fix for Bug#35469: server crash with LOAD DATA INFILE to a VIEW. · 4ec65151
      unknown authored
      The problem was that LOAD DATA code (sql_load.cc) didn't take into
      account that there may be items, representing references to other
      columns. This is a usual case in views. The crash happened because
      Item_direct_view_ref was casted to Item_user_var_as_out_param,
      which is not a base class.
      
      The fix is to
        1) Handle references properly;
        2) Ensure that an item is treated as a user variable only when
           it is a user variable indeed;
        3) Report an error if LOAD DATA is used to load data into
           non-updatable column.
      
      
      mysql-test/r/loaddata.result:
        Update result file.
      mysql-test/t/loaddata.test:
        Add a test case form Bug#35469: server crash with
        LOAD DATA INFILE to a VIEW.
      sql/share/errmsg.txt:
        Introduce a new error.
      sql/sql_load.cc:
        Handle reference-items properly.
      mysql-test/std_data/bug35649.data:
        Add a data file for the test case.
      4ec65151
    • unknown's avatar
      Merge witty.:/Users/mattiasj/clones/bug21413-50-engines · 0e4dd57a
      unknown authored
      into  witty.:/Users/mattiasj/clones/bug21413-50-bugteam
      
      
      0e4dd57a
    • unknown's avatar
      Merge witty.:/Users/mattiasj/Public/shared-vms/bug21413-41-engines · 32d232ff
      unknown authored
      into  witty.:/Users/mattiasj/clones/bug21413-50-engines
      
      
      sql/sql_insert.cc:
        Manual merge
      32d232ff
    • unknown's avatar
      Bug#21413 - Engine table handler used by multiple threads · fe22ff56
      unknown authored
                  in REPLACE DELAYED
          
      post push patch, removing the optimization for
      copying delayed_insert variables.
      
      
      sql/sql_insert.cc:
        Bug#21413 - Engine table handler used by multiple threads
                    in REPLACE DELAYED
        
        post push patch, removing the optimization for
        copying delayed_insert variables.
        (restored some parts which caused errors)
      fe22ff56
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam · 7c156537
      unknown authored
      into  moonbone.local:/work/27219-5.0-opt-mysql
      
      
      sql/item.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      7c156537
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · ab82016a
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
      
      
      sql/sql_acl.cc:
        Auto merged
      ab82016a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · b6b4202b
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
      
      
      b6b4202b
  9. 27 Mar, 2008 13 commits
    • unknown's avatar
      Merge mysql.com:/misc/mysql/mysql-5.0 · ed1d366a
      unknown authored
      into  mysql.com:/misc/mysql/mysql-5.0-opt
      
      
      CMakeLists.txt:
        Auto merged
      configure.in:
        Auto merged
      include/config-win.h:
        Auto merged
      include/my_global.h:
        Auto merged
      ed1d366a
    • unknown's avatar
      Bug#27219: Aggregate functions in ORDER BY. · 9d661efd
      unknown authored
      Mixing aggregate functions and non-grouping columns is not allowed in the
      ONLY_FULL_GROUP_BY mode. However in some cases the error wasn't thrown because
      of insufficient check.
      
      In order to check more thoroughly the new algorithm employs a list of outer
      fields used in a sum function and a SELECT_LEX::full_group_by_flag.
      Each non-outer field checked to find out whether it's aggregated or not and
      the current select is marked accordingly.
      All outer fields that are used under an aggregate function are added to the
      Item_sum::outer_fields list and later checked by the Item_sum::check_sum_func
      function.
      
      
      mysql-test/t/group_by.test:
        Added a test case for the bug#27219: Aggregate functions in ORDER BY.
      mysql-test/r/group_by.result:
        Added a test case for the bug#27219: Aggregate functions in ORDER BY.
      sql/sql_select.cc:
        Bug#27219: Aggregate functions in ORDER BY.
        Implementation of new check for mixing non aggregated fields and aggregation
        function in the ONLY_FULL_GROUP_BY mode.
      sql/sql_lex.cc:
        Bug#27219: Aggregate functions in ORDER BY.
        Initialization of the full_group_by_flag bitmap.
        SELECT_LEX::test_limit function doesn't reset ORDER BY
        clause anymore.
      sql/sql_lex.h:
        Bug#27219: Aggregate functions in ORDER BY.
        The full_group_by_flag is added to the SELECT_LEX class.
      sql/item_sum.h:
        Bug#27219: Aggregate functions in ORDER BY.
        The outer_fields list is added to the Item_sum class.
      sql/mysql_priv.h:
        Bug#27219: Aggregate functions in ORDER BY.
        Defined a set of constants used in the new check for mixing non aggregated
        fields and sum functions in the ONLY_FULL_GROUP_BY_MODE.
      sql/item_subselect.cc:
        Bug#27219: Aggregate functions in ORDER BY.
        The Item_in_subselect::select_in_like_transformer function now drops
        ORDER BY clause in all selects in a subquery.
      sql/item_sum.cc:
        Bug#27219: Aggregate functions in ORDER BY.
        Now the Item_sum::check_sum_func function now checks whether fields in the
        outer_fields list are aggregated or not and marks selects accordingly.
      sql/item.cc:
        Bug#27219: Aggregate functions in ORDER BY.
        Now the Item_field::fix_fields function checks whether the field is aggregated
        or not and marks its select_lex accordingly.
      9d661efd
    • unknown's avatar
      Merge host.loc:/home/uchum/work/mysql-5.0 · 8e473edd
      unknown authored
      into  host.loc:/home/uchum/work/5.0-opt
      
      
      configure.in:
        Auto merged
      sql/item.cc:
        Auto merged
      8e473edd
    • unknown's avatar
      Merge witty.:/Users/mattiasj/Public/shared-vms/bug21413-41-engines · da9db4ed
      unknown authored
      into  witty.:/Users/mattiasj/clones/bug21413-50-engines
      
      
      sql/sql_insert.cc:
        Manual merge
      da9db4ed
    • unknown's avatar
      Patch clean up. · f8653a79
      unknown authored
      Fixed interference between tests: Users were added but not properly removed.
      This caused later tests to fail.
      
      
      mysql-test/r/grant.result:
        Fixed interference between tests: Users were added but not properly removed.
        This caused later tests to fail.
      mysql-test/t/grant.test:
        Fixed interference between tests: Users were added but not properly removed.
        This caused later tests to fail.
      f8653a79
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 0db1f520
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      0db1f520
    • unknown's avatar
      Merge mysql.com:/Users/davi/mysql/mysql-5.1-bug33201 · 861434c3
      unknown authored
      into  mysql.com:/Users/davi/mysql/mysql-5.0-bugteam
      
      
      sql/sql_acl.cc:
        Auto merged
      861434c3
    • unknown's avatar
      BUG#25340 · 5a6b357e
      unknown authored
      5a6b357e
    • unknown's avatar
      Merge host.loc:/home/uchum/work/4.1-opt · 1207c866
      unknown authored
      into  host.loc:/home/uchum/work/5.0-opt
      
      
      configure.in:
        Merge with 4.1-opt.
      1207c866
    • unknown's avatar
      Merge host.loc:/home/uchum/work/mysql-5.0 · 11cfd2ed
      unknown authored
      into  host.loc:/home/uchum/work/5.0-opt
      
      
      sql/sql_delete.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      11cfd2ed
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 9878e861
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      configure.in:
        Auto merged
      9878e861
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 42a06b46
      unknown authored
      into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/50
      
      
      42a06b46
    • unknown's avatar
      post fix after push of BUG#33029 · 4020e6a2
      unknown authored
      
      mysql-test/r/binlog_killed_simulate.result:
        Update test result after push of bug#33029
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Update test result after push of bug#33029
      mysql-test/r/multi_update.result:
        Update test result after push of bug#33029
      mysql-test/r/rpl_auto_increment_bug33029.result:
        disable warning messages
      mysql-test/r/rpl_user.result:
        Update test result after push of bug#33029
      mysql-test/t/rpl_auto_increment_bug33029.test:
        disable warning messages
      4020e6a2