1. 25 Jul, 2006 1 commit
  2. 24 Jul, 2006 5 commits
    • unknown's avatar
      Merge trift2.:/M41/clone-4.1 · a7e2f2fe
      unknown authored
      into  trift2.:/M50/merge-4.1-to-5.0
      
      
      VC++Files/libmysqld/libmysqld.dsp:
        Auto merged
      VC++Files/libmysqld/libmysqld.vcproj:
        Auto merged
      VC++Files/libmysqld/libmysqld_ia64.dsp:
        Auto merged
      VC++Files/mysqldemb/mysqldemb.dsp:
        Auto merged
      VC++Files/sql/mysqld.dsp:
        Auto merged
      VC++Files/sql/mysqld.vcproj:
        Auto merged
      VC++Files/sql/mysqld_ia64.dsp:
        Auto merged
      VC++Files/sql/mysqldmax.dsp:
        Auto merged
      sql/field.cc:
        Merge a backport == Null-merge == "ul".
      sql/field.h:
        Merge a backport == Null-merge == "ul".
      sql/sql_locale.cc:
        Changes were already present (and even better) == Null-merge == "ul".
      a7e2f2fe
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 536dabd0
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
      
      
      client/mysql.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      536dabd0
    • unknown's avatar
      Merge trift2.:/M41/push-1-4.1 · 71a7524f
      unknown authored
      into  trift2.:/M50/merge-4.1-to-5.0
      
      
      strings/strtod.c:
        Manual merge: Null merge with header file cleanup ("my_base.h" includes "my_global.h", so we do not need both).
      71a7524f
    • unknown's avatar
      Merge trift2.:/M41/tmp_merge · d1b42560
      unknown authored
      into  trift2.:/M50/merge-4.1-to-5.0
      
      
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_locale.cc:
        Auto merged
      sql/item_timefunc.cc:
        Merging by "ul", as asked in the original changeset.
      support-files/mysql.spec.sh:
        Manual merge, keeping alphabetic order.
      d1b42560
    • unknown's avatar
      Merge trift2.:/M41/tmp_merge · 6a3f8efe
      unknown authored
      into  trift2.:/M50/merge-4.1-to-5.0
      
      
      support-files/mysql.spec.sh:
        Auto merged
      configure.in:
        Manual - "use local".
      6a3f8efe
  3. 21 Jul, 2006 4 commits
  4. 20 Jul, 2006 2 commits
  5. 19 Jul, 2006 8 commits
    • unknown's avatar
      Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release · 14c7ea5d
      unknown authored
      into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0
      
      
      sql/sql_insert.cc:
        Auto merged
      14c7ea5d
    • unknown's avatar
      manual merge, part 2/2 · 437d403e
      unknown authored
      
      mysql-test/r/mysqldump.result:
        manual mergies, part 2/2
      437d403e
    • unknown's avatar
      Bug #21135 Crash in test "func_time" · 0794dc71
      unknown authored
       - backport patch from 5.0
       - "table" can be NULL in temporary fields used for type conversion
      
      
      sql/field.cc:
        table can be NULL in temporary fields used for type conversion.
        Store value in field as if db_low_byte_first was set.
      sql/field.h:
        table can be NULL in temporary fields used for type conversion.
        Store value in field as if db_low_byte_first was set.
      0794dc71
    • unknown's avatar
      Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release · feb5f6b9
      unknown authored
      into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge
      
      
      support-files/mysql.spec.sh:
        Auto merged
      client/mysqldump.c:
        manual merge
      mysql-test/r/mysqldump.result:
        manual merge
      mysql-test/t/mysqldump.test:
        manual merge
      feb5f6b9
    • unknown's avatar
      Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER · bad5a781
      unknown authored
      REPLACE ... SELECT would require INSERT privileges on certain tables
      when SELECT really suffices. Require INSERT only on target table.
      
      
      mysql-test/r/insert_select.result:
        Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER
        
        Show that REPLACE ... SELECT requires INSERT privileges only on target table.
        (revised test with more view-fu)
      mysql-test/t/insert_select.test:
        Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER
        
        Show that REPLACE ... SELECT requires INSERT privileges only on target table.
        (revised test with more view-fu)
      sql/sql_insert.cc:
        Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER
        
        require SELECT rather than INSERT privs on tables that constitute the views we'll read
      bad5a781
    • unknown's avatar
      "BUG #18764: Delete conditions causing inconsistencies in Federated tables" · 765e5edf
      unknown authored
      Post merge changes.
      
      765e5edf
    • unknown's avatar
      mysql.spec.sh: · eff4efa8
      unknown authored
        Added new "mysql_explain_log" man page
        Added missing install of "myisam_ftdump" man page
        Added missing install of "mysqlman" man page
      
      
      support-files/mysql.spec.sh:
        Added new "mysql_explain_log" man page
        Added missing install of "myisam_ftdump" man page
        Added missing install of "mysqlman" man page
      eff4efa8
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 307ec249
      unknown authored
      into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0-bug18764.2
      
      
      mysql-test/r/federated.result:
        "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
        
        hand merge
      mysql-test/t/federated.test:
        "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
        
        hand merge
      sql/ha_federated.cc:
        "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
        
        hand merge
      307ec249
  6. 18 Jul, 2006 12 commits
  7. 17 Jul, 2006 8 commits
    • unknown's avatar
      "BUG #18764: Delete conditions causing inconsistencies in Federated tables" · 4e06ba9f
      unknown authored
      Removed logic in ha_federated::write_row, which checks field query ids in the
      loop which builds the query to run on the remote server.
      
      
      mysql-test/r/federated.result:
        "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
        
        
        New test results for test that verifies that one can insert to rows using 
        "insert into... select * from..", delete 
        them by id, then immediately insert them in the same way they were originally 
        inserted.
      mysql-test/t/federated.test:
        "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
        
        
        New test that verifies that one can insert to rows using 
        "insert into... select * from..", delete 
        them by id, then immediately insert them in the same way they were originally 
        inserted.
      sql/ha_federated.cc:
        "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
        
        Removed the logic in ha_federated::write_row which checked the query id of 
        each field and compared it to the thread query id.
        
        Each field has a query id, and the problem used to be that if I did an insert
        no fields specified, the field value would contain the last inserted value 
        for that field. The way to work around this was to see if the query id for 
        that field was the same as the current query id or of the rest of the field 
        query ids. If it wasn't, that told me the query didn't have the field value 
        specified.
        
        Somewhere from when I wrote that code to now the problem went away, and there
        was no longer the need for this logic. 
        
        Also removed the bool "has_fields", which needs not exist and using 
        table->s->fields is sufficient.
      4e06ba9f
    • unknown's avatar
      Post-merge fix. · 5da5f4e0
      unknown authored
      5da5f4e0
    • unknown's avatar
      Bug# 20221- Dumping of multiple databases containing view(s) yields maleformed dumps. · 1c242b0e
      unknown authored
      
      client/mysqldump.c:
        When dumping more than one database, make sure that the proper database is selected before restoring that database's views.
        Replaced hard-coded database name length with appropiate token.
      mysql-test/r/mysqldump.result:
        Added new result and corrected results for existing test cases.
      mysql-test/t/mysqldump.test:
        Added new case for dumping and restoring multiple databases each containing a view.
      1c242b0e
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8db9d704
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.0-opt
      
      
      mysql-test/r/subselect.result:
        Manual merge
      mysql-test/t/subselect.test:
        Manual merge
      8db9d704
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-kt · 2f26dc08
      unknown authored
      into  rama.(none):/home/jimw/my/mysql-5.0-17485
      
      
      client/mysql.cc:
        Auto merged
      2f26dc08
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f4aa13fe
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.0-opt
      
      f4aa13fe
    • unknown's avatar
      Changes to make "sql/sql_locale.cc" compile + link on Windows: · 1c410132
      unknown authored
      1) When initializing a boolean variable, do not use string representations '"false"' and '"true"' 
          but rather the boolean values 'false' and 'true'.
      2) Add the module to the various Windows description files.
      
      
      VC++Files/libmysqld/libmysqld.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/libmysqld/libmysqld.vcproj:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/libmysqld/libmysqld_ia64.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/mysqldemb/mysqldemb.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/mysqldemb/mysqldemb.vcproj:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/mysqldemb/mysqldemb_ia64.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/sql/mysqld.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/sql/mysqld.vcproj:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/sql/mysqld_ia64.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/sql/mysqldmax.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      VC++Files/sql/mysqldmax_ia64.dsp:
        Add "sql/sql_locale.cpp" with similar settings as the other files.
      sql/sql_locale.cc:
        When initializing a boolean variable, do not use stringrepresentations '"false"' and '"true"' 
        but rather the boolean values 'false' and 'true'.
      1c410132
    • unknown's avatar
      strings/strtod.c : Ensure the definition of "EOVERFLOW" is available. · a9fb36e2
      unknown authored
      In 5.0, this is already solved, so that is a null-merge ("ul").
      
      
      strings/strtod.c:
        This file needs the definition of "EOVERFLOW",
        which is on some platforms (Windows, OpenBSD) provided only by "my_base.h".
        As this in turn includes "my_global.h", the include file name can be changed.
      a9fb36e2