1. 19 Mar, 2009 22 commits
  2. 18 Mar, 2009 18 commits
    • Sergey Petrunia's avatar
      Merge · 5b8156e0
      Sergey Petrunia authored
      5b8156e0
    • Horst Hunger's avatar
      due to merge (pull) · c7505147
      Horst Hunger authored
      c7505147
    • Horst Hunger's avatar
    • Bernt M. Johnsen's avatar
      Bug#43329 prepared for commit on 5.0 · 4d32be13
      Bernt M. Johnsen authored
      4d32be13
    • Tatiana A. Nurnberg's avatar
      auto-merge · f060a5fc
      Tatiana A. Nurnberg authored
      f060a5fc
    • Vladislav Vaintroub's avatar
      merge · 93771759
      Vladislav Vaintroub authored
      93771759
    • Georgi Kodinov's avatar
      6290bc7e
    • Georgi Kodinov's avatar
      merged 5.1-main -> 5.1-bugteam · a673bdd3
      Georgi Kodinov authored
      a673bdd3
    • Guangbao Ni's avatar
      Auto-merged from 5.1-bugteam · ff37912f
      Guangbao Ni authored
      ff37912f
    • Guangbao Ni's avatar
      Auto-merge from 5.1-bugteam · 224376a7
      Guangbao Ni authored
      224376a7
    • Guangbao Ni's avatar
      Bug #42217 mysql.procs_priv does not get replicated · 0ba1cc25
      Guangbao Ni authored
      mysql.procs_priv table itself does not get replicated.
      Inserting routine privilege record into mysql.procs_priv table
      is triggered by creating function/procedure statements
      according to current user's privileges.
      Because the current user of SQL thread has GLOBAL_ACL,
      which doesn't need any check mysql.procs_priv privilege
      when create/alter/execute routines.
      Corresponding GLOBAL_ACL privilege user
      doesn't insert routine privilege record into
      mysql.procs_priv when creating a routine.
      
      Fixed by switching the current user of SQL thread to definer user if
      the definer user exists on slave.
      That populates procs_priv, otherwise to keep the SQL thread
      user and procs_priv remains unchanged.
      
      
      mysql-test/suite/rpl/r/rpl_do_grant.result:
        Test case result for routine privilege when definer user exist or not on slave
      mysql-test/suite/rpl/t/rpl_do_grant.test:
        Test case result for routine privilege when definer user exist or not on slave
      sql/sql_parse.cc:
        Switch current user of SQL thread to definer user if the definer user
        existes on slave when checking whether the routine privilege is
        needed to insert mysql.procs_priv table or not.
      0ba1cc25
    • Tatiana A. Nurnberg's avatar
      auto-merge · a8fad0c9
      Tatiana A. Nurnberg authored
      a8fad0c9
    • Sergey Petrunia's avatar
      Merge · 79d59cca
      Sergey Petrunia authored
      79d59cca
    • Alexey Kopytov's avatar
      Automerge. · da7dc303
      Alexey Kopytov authored
      da7dc303
    • Alexey Kopytov's avatar
      Manual merge. · 2b253395
      Alexey Kopytov authored
      2b253395
    • Alexey Kopytov's avatar
      Fix for bug#41486: extra character appears in BLOB for every · 73a7d993
      Alexey Kopytov authored
                         ~40Mb after mysqldump/import 
              
      When the input string exceeds the maximum allowed size for the 
      internal buffer, batch_readline() returns a truncated string. 
      Since there was no way for a caller to determine whether the 
      string was truncated or not, the command line client assumed 
      batch_readline() to always return the whole input string and 
      appended a newline character. This resulted in garbled data 
      when importing dumps containing strings longer than the 
      maximum input buffer size. 
        
      Fixed by adding a flag to the batch_readline() interface to 
      signal a truncated string to the caller. 
        
      Other minor problems fixed during patch implementation: 
       
      - The maximum allowed buffer size for batch_readline() was set 
      up depending on the client's max_allowed_packet value. It does 
      not actully make any sense, as those variables are not 
      related. The input buffer size limit is now always set to 1 
      MB. 
        
      - fill_buffer() did not always set the EOF flag. 
       
      - The input buffer could actually grow twice as the specified 
      limit due to insufficient checks in intern_read_line(). 
      
      client/my_readline.h:
        Changed the interface of batch_readline().
      client/mysql.cc:
        Honor the truncated flag returned by batch_readline() and do  
        not append the newline character if it was set. Since we can't 
        change the interfaces for readline()/fgets() used in the  
        interactive mode, always assume the returned string was not  
        truncated. In addition, always set the batch_readline()  
        internal buffer to 1 MB, independently from the client's  
        max_allowed_packet.
      client/readline.cc:
        Added the 'truncated' argument do batch_readline() to signal 
        truncated string to a caller. 
        Fixed fill_buffer() to set the EOF flag correctly. 
        Fixed checks in intern_read_line() to not allow the internal  
        buffer grow past the specified limit.
      mysql-test/r/mysql.result:
        Added a test case for bug #41486.
      mysql-test/t/mysql.test:
        Added a test case for bug #41486.
      73a7d993
    • Satya B's avatar
      merge to 5.1-bugteam branch · 1367981c
      Satya B authored
      1367981c
    • Satya B's avatar
      Fix for BUG#32880 - Repairing Archive table fails with internal error 144 · 497db6ac
      Satya B authored
      Any statement reading corrupt archive data file
      (CHECK/REPAIR/SELECT/UPDATE/DELETE) may cause assertion
      failure in debug builds. This assertion has been removed
      and an error is returned instead.
      
      Also fixed that CHECK/REPAIR returns vague error message
      when it mets corruption in archive data file. This is
      fixed by returning proper error code.
      
      mysql-test/r/archive.result:
        A test case for BUG#32880
      mysql-test/std_data/bug32880.ARN:
        corrupted archive table to test check and repair table operation
      mysql-test/std_data/bug32880.ARZ:
        corrupted archive table to test check and repair table operation
      mysql-test/std_data/bug32880.frm:
        corrupted archive table to test check and repair table operation
      mysql-test/t/archive.test:
        A test case for BUG#32880
      storage/archive/ha_archive.cc:
        Fixed unpack_row() to return the error instead of throwing assertion 
        and also fixed repair() to throw better error when repair table
        operation fails on corrupted archive table
      497db6ac