1. 03 Oct, 2006 4 commits
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1-rpl.b8663 · 90316529
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0-rpl
      
      
      myisam/mi_key.c:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        After merge fix
      90316529
    • unknown's avatar
      Bug#22052 Trailing spaces are not removed from UNICODE fields in an index · de70be9d
      unknown authored
        Fix: using charset-aware functions cs->cset->lengthsp() and cs->cset->fill()
        instead of single byte code which is not UCS2 compatible.
      
      
      myisam/mi_key.c:
        Using character-set aware functions to trim and append spaces.
      myisam/mi_open.c:
        Initialize charset for BINARY/VARBINARY to my_charset_bin,
            instead of NULL
      mysql-test/r/ctype_ucs.result:
        Adding test case
      mysql-test/t/ctype_ucs.test:
        Adding test case
      de70be9d
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1-rpl.b8663 · c317c2d2
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0-rpl
      
      
      mysql-test/r/cast.result:
        null merge for bug#8663
        It will beed another fix for 5.0
        - changes in new DECIMAL instead of FLOAT
      mysql-test/r/ps.result:
        null merge
      mysql-test/t/cast.test:
        null merge
      mysql-test/t/count_distinct3.test:
        null merge
      sql/item_func.cc:
        null merge
      c317c2d2
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1.b8663 · dc62ff55
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1-rpl
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      dc62ff55
  2. 02 Oct, 2006 2 commits
  3. 29 Sep, 2006 4 commits
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2 · 4357e220
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b6147rpl
      
      
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      sql/field.cc:
        Auto merged
      4357e220
    • unknown's avatar
      Bug#21263 mysql client XML output does not distinguish between NULL and string 'NULL' · 1b4d6a05
      unknown authored
        
        Fix: "mysql --xml" now print NULL values the same way that "mysqldump --xml" does:
        
          <field name="name" xsi:nil="true" />
        
        to distinguish from empty strings:
        
          <field name="name"></field>
        
        and from string "NULL":
        
          <field name="name">NULL</field>
      
      
      client/mysql.cc:
        Fixing to print NULLs differently from empty strings
      mysql-test/r/client_xml.result:
        Fixing test result accordingly
      1b4d6a05
    • unknown's avatar
      Bug#21620 ALTER TABLE affects other columns · 880c9b2a
      unknown authored
        Problem: for character sets having mbmaxlen==2,
        any ALTER TABLE changed TEXT column type to MEDIUMTEXT,
        due to wrong "internal length to create length" formula.
        Fix: removing rounding code introduced in early 4.1 time,
        which is not correct anymore.
      
      
      mysql-test/r/ctype_gbk.result:
        Adding test case
      mysql-test/t/ctype_gbk.test:
        Adding test case
      sql/field.cc:
        Fixing "internal length to create length" formula.
      880c9b2a
    • unknown's avatar
      Bug#19960 Inconsistent results when joining InnoDB tables using partial UTF8 indexes · 695bcb9e
      unknown authored
        Adding a multibyte-aware VARCHAR copying function, to put correct column prefix,
        taking in account number of characters (instead just limiting on number of bytes).
        For example, for a KEY(col(3)) on a UTF8 column when copying the string 'foo bar foo',
        we should put only 3 leftmost characters: 'foo'.
        9 characters were incorrectly put before this fix.
      
      
      mysql-test/r/ctype_utf8.result:
        Adding test case
      mysql-test/t/ctype_utf8.test:
        Adding test case
      sql/field_conv.cc:
        Adding multibyte aware copy function for VARCHAR
      695bcb9e
  4. 28 Sep, 2006 6 commits
    • unknown's avatar
      view.test: · 04bf9cc7
      unknown authored
        After merge fix
      
      
      mysql-test/t/view.test:
        After merge fix
      04bf9cc7
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 09542617
      unknown authored
      into  moonbone.local:/work/5505-bug-5.0-opt-mysql
      
      
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      mysql-test/r/view.result:
        Manual merge
      mysql-test/t/view.test:
        Manual merge
      09542617
    • unknown's avatar
      Fixed bug#5505: Wrong error message on INSERT into a view · d332c37c
      unknown authored
      On an INSERT into an updatable but non-insertable view an error message was
      issued stating the view being not updatable. This can lead to a confusion of a
      user.
      
      A new error message is introduced. Is is showed when a user tries to insert
      into a non-insertable view.
      
      
      sql/sql_base.cc:
        Fixed bug#5505: Wrong error message on INSERT into a view
        The update_non_unique_table_error() function now issues proper
        error for an INSERT.
      sql/sql_insert.cc:
        Fixed bug#5505: Wrong error message on INSERT into a view
        Issue the ER_NON_INSERTABLE_TABLE error instead of the 
        ER_NON_UPDATABLE_TABLE on insert into a view.
      sql/sql_view.cc:
        Fixed bug#5505: Wrong error message on INSERT into a view
        Issue the ER_NON_INSERTABLE_TABLE error instead of the
        ER_NON_UPDATABLE_TABLE on insert into a view.
      mysql-test/r/view.result:
        Added the test case for bug#5505: Wrong error message on INSERT into a view
        Corrected a few test cases after fixing bug#5505
      mysql-test/t/view.test:
        Added the test case for bug#5505: Wrong error message on INSERT into a view
        Corrected a few test cases after fixing bug#5505
      sql/share/errmsg.txt:
        Fixed bug#5505: Wrong error message on INSERT into a view
        Added the ER_NON_INSERTABLE_TABLE error definition.
      d332c37c
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · d30536dc
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
      
      
      sql/sql_select.cc:
        Auto merged
      d30536dc
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0 · 70255e85
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      70255e85
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1 · b8fe6206
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
      
      
      sql/sql_select.cc:
        Auto merged
      b8fe6206
  5. 27 Sep, 2006 7 commits
  6. 26 Sep, 2006 1 commit
    • unknown's avatar
      Merge trift2.:/MySQL/M50/clone-5.0 · 3436f0ac
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      mysql-test/r/func_time.result:
        Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/type_date.result:
        Auto merged
      mysql-test/r/view.result:
        Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
      mysql-test/t/func_time.test:
        Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
      mysql-test/t/type_date.test:
        Auto merged
      mysql-test/t/view.test:
        Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
      sql/item_cmpfunc.cc:
        Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
      3436f0ac
  7. 25 Sep, 2006 7 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0-opt · 78bf0287
      unknown authored
      into  rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21646
      
      
      78bf0287
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1-opt · 39222bff
      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
      sql/item.cc:
        Manual merge
      39222bff
    • unknown's avatar
      Fixed bug #21646. · f0bd502a
      unknown authored
      Presence of a subquery in the ON expression of a join 
      should not block merging the view that contains this join.
      Before this patch the such views were converted into 
      into temporary table views.
      
      
      mysql-test/r/view.result:
        Added a test case for bug #21646.
      mysql-test/t/view.test:
        Added a test case for bug #21646.
      sql/mysql_priv.h:
        Fixed bug #21646.
        Added a new parsing state 'IN_ON', true when
        the parser is in an ON expression of a join.
      sql/sql_lex.cc:
        Fixed bug #21646.
        Presence of a subquery in the ON expression of a join 
        should not block merging the view that contains this join.
      sql/sql_yacc.yy:
        Fixed bug #21646.
        Added a new parsing state 'IN_ON', true when
        the parser is in an ON expression of a join.
      f0bd502a
    • unknown's avatar
      Fixed bug #21853: assert failure for a grouping query with · 9bf2ed95
      unknown authored
      an ALL/ANY quantified subquery in HAVING.
      The Item::split_sum_func2 method should not create Item_ref
      for objects of any class derived from Item_subselect.
      
      
      mysql-test/r/subselect.result:
        Added a test case for bug #21853.
      mysql-test/t/subselect.test:
        Added a test case for bug #21853.
      9bf2ed95
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-4.1.15428 · fe9f7980
      unknown authored
      into  mysql.com:/home/hf/work/mysql-5.0-mrg
      
      
      myisam/mi_check.c:
        Auto merged
      mysys/my_chsize.c:
        Auto merged
      fe9f7980
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-4.1.12991 · feb9cc2f
      unknown authored
      into  mysql.com:/home/hf/work/mysql-4.1.15428
      
      
      myisam/mi_check.c:
        Auto merged
      feb9cc2f
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1-opt · 862187ef
      unknown authored
      into  mysql.com:/home/hf/work/mysql-4.1.15428
      
      
      862187ef
  8. 24 Sep, 2006 2 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 16ea3ca1
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      16ea3ca1
    • unknown's avatar
      mysql_config.sh: · 103fc806
      unknown authored
        Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
        Filter out icc specific options from cflags/libs(_r)
      
      
      scripts/mysql_config.sh:
        Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
      103fc806
  9. 23 Sep, 2006 5 commits
  10. 22 Sep, 2006 2 commits
    • unknown's avatar
      Fix for bug #19121: Windows incompatible udf_example · 0c5d3627
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        fixed path for udf_example.so when running testsuite on Windows
      sql/CMakeLists.txt:
        Added missing udf_example
      sql/Makefile.am:
        Added udf_example files for make dist
      sql/udf_example.c:
        fix for Windows: Windows doesn't have socket.h and friends
        
        Added replacements for strmov,bzero and memcpy_fixed when compiling standalone.
      sql/udf_example.def:
        BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/udf_example.def
      0c5d3627
    • unknown's avatar
      Added build rule for mysql_upgrade.exe · fcd21bd4
      unknown authored
      fcd21bd4