1. 27 Jan, 2010 2 commits
  2. 25 Jan, 2010 3 commits
  3. 22 Jan, 2010 2 commits
  4. 21 Jan, 2010 3 commits
  5. 20 Jan, 2010 4 commits
  6. 19 Jan, 2010 4 commits
  7. 18 Jan, 2010 6 commits
  8. 15 Jan, 2010 8 commits
    • Georgi Kodinov's avatar
      Bug #46175: NULL read_view and consistent read assertion · 440f5a9c
      Georgi Kodinov authored
      The optimizer must not continue executing the current query
      if e.g. the storage engine reports an error.
      This is somewhat hard to implement with Item::val_xxx()
      because they do not have means to return error code.
      This is why we need to check the thread's error state after
      a call to one of the Item::val_xxx() methods.
      
      Fixed store_key_item::copy_inner() to return an error state 
      if an error happened during the call to Item::save_in_field() 
      because it calls Item::val_xxx().
      Also added similar checks to related places.
      440f5a9c
    • Sergey Glukhov's avatar
      compilation failure fix · 31740ffd
      Sergey Glukhov authored
      31740ffd
    • Sergey Glukhov's avatar
      backported: · 8b36b965
      Sergey Glukhov authored
      -WL#2822 INFORMATION_SCHEMA.ROUTINES: Add missing columns
      -WL#2003 INFORMATION_SCHEMA: PARAMETERS view
      -addon for 'I_S optimization' WL
      8b36b965
    • Alexey Kopytov's avatar
      Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. · 82ba3e1d
      Alexey Kopytov authored
      Conflicts:
      
      Text conflict in .bzr-mysql/default.conf
      Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
      Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
      Text conflict in mysql-test/t/mysqlbinlog.test
      Text conflict in sql/sql_acl.cc
      Text conflict in sql/sql_servers.cc
      Text conflict in sql/sql_update.cc
      Text conflict in support-files/mysql.spec.sh
      82ba3e1d
    • Georgi Kodinov's avatar
      merge · 6d66e660
      Georgi Kodinov authored
      6d66e660
    • Georgi Kodinov's avatar
      merge of version change. · 30a8c53a
      Georgi Kodinov authored
      Added not_embedded to the new dbug_sync test file.
      30a8c53a
    • 's avatar
      Fix for perfschema.binlog_stmt failure: · fe99d915
      authored
              
      Problem: The test case failed because: (i) warning text in 
               result file differed from the warning output by the 
               server, and (ii) binlog contents in result file did
               not show the statements logged wrapped in BEGIN/COMMIT
               as it is the case after WL 2687.
            
      Solution: We update the result file, but first we change the
                unsafe warning text to also refer to performance_schema
                table(s). This required changing the result files for
                existing test cases that provide output for warnings 
                related to ER_BINLOG_UNSAFE_SYSTEM_TABLE. "Grepping" in
                result files, shows that only binlog_unsafe contained
                reference to such a warning.
            
                We also update the result file with the missing 
                BEGIN/COMMIT statements.
      fe99d915
    • MySQL Build Team's avatar
  9. 14 Jan, 2010 8 commits