1. 29 Mar, 2007 1 commit
    • unknown's avatar
      Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel · 374718ff
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      client/mysql.cc:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      BitKeeper/deleted/.del-my_lread.c:
        Auto merged
      BitKeeper/deleted/.del-my_lwrite.c:
        Auto merged
      BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1:
        Auto merged
      BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6:
        Auto merged
      client/mysqldump.c:
        Auto merged
      extra/perror.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/libmysqld.c:
        Auto merged
      mysql-test/r/mysqlbinlog2.result:
        Auto merged
      mysql-test/r/sp-security.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/sp-security.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/sp_trans.test:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/hash.c:
        Auto merged
      mysys/mf_iocache.c:
        Auto merged
      mysys/mf_keycache.c:
        Auto merged
      mysys/my_alloc.c:
        Auto merged
      mysys/my_dup.c:
        Auto merged
      mysys/my_getwd.c:
        Auto merged
      mysys/my_handler.c:
        Auto merged
      mysys/my_lib.c:
        Auto merged
      mysys/my_malloc.c:
        Auto merged
      mysys/my_pread.c:
        Auto merged
      mysys/my_read.c:
        Auto merged
      mysys/my_seek.c:
        Auto merged
      mysys/my_static.c:
        Auto merged
      mysys/safemalloc.c:
        Auto merged
      mysys/thr_alarm.c:
        Auto merged
      mysys/typelib.c:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/strfunc.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      storage/archive/ha_archive.cc:
        Auto merged
      storage/heap/_check.c:
        Auto merged
      storage/heap/hp_delete.c:
        Auto merged
      storage/heap/hp_hash.c:
        Auto merged
      storage/heap/hp_open.c:
        Auto merged
      storage/heap/hp_rkey.c:
        Auto merged
      storage/heap/hp_rrnd.c:
        Auto merged
      storage/heap/hp_write.c:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/mi_close.c:
        Auto merged
      storage/myisam/mi_delete.c:
        Auto merged
      storage/myisam/mi_dynrec.c:
        Auto merged
      storage/myisam/mi_keycache.c:
        Auto merged
      storage/myisam/mi_page.c:
        Auto merged
      storage/myisam/mi_statrec.c:
        Auto merged
      storage/myisam/myisamchk.c:
        Auto merged
      storage/myisammrg/myrg_extra.c:
        Auto merged
      storage/ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/grant.result:
        Merged from 5.0
      mysql-test/r/sp.result:
        Merged from 5.0
      mysql-test/r/sp_trans.result:
        Merged from 5.0
      mysql-test/t/mysqlbinlog2.test:
        Merged from 5.0
      mysys/thr_lock.c:
        Merged from 5.0
      sql/ha_ndbcluster.cc:
        Merged from 5.0
      sql/log.cc:
        Merged from 5.0
      sql/mysql_priv.h:
        Merged from 5.0
      sql/mysqld.cc:
        Merged from 5.0
      sql/set_var.cc:
        Merged from 5.0
      sql/sql_db.cc:
        Merged from 5.0
      sql/sql_insert.cc:
        Merged from 5.0
      sql/sql_parse.cc:
        Merged from 5.0
      sql/sql_show.cc:
        Merged from 5.0
      sql/sql_update.cc:
        Merged from 5.0
      374718ff
  2. 28 Mar, 2007 3 commits
    • unknown's avatar
      Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main · 00aaa9a3
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
      
      
      BitKeeper/deleted/.del-_dynrec.c~48dd758f5a5450df:
        Auto merged
      BitKeeper/deleted/.del-_page.c~148b1a613d052ee8:
        Auto merged
      BitKeeper/deleted/.del-_search.c~f509292aa1ff18ff:
        Auto merged
      BitKeeper/deleted/.del-close.c~fd62629496ee5bcc:
        Auto merged
      BitKeeper/deleted/.del-delete.c~65ee8daaa75a14b6:
        Auto merged
      BitKeeper/deleted/.del-my_tempnam.c~a8562f15dad3012f:
        Auto merged
      BitKeeper/deleted/.del-open.c~95b3b75042fae00a:
        Auto merged
      BitKeeper/deleted/.del-rkey.c~cc54c6498352f999:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/raid.h:
        Auto merged
      myisam/mi_close.c:
        Auto merged
      BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
        Auto merged
      BitKeeper/deleted/.del-write.c~8f1918b1f6770e54:
        Auto merged
      myisam/mi_page.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/mf_keycaches.c:
        Auto merged
      mysys/my_dup.c:
        Auto merged
      mysys/my_fopen.c:
        Auto merged
      mysys/my_handler.c:
        Auto merged
      mysys/my_malloc.c:
        Auto merged
      mysys/my_static.c:
        Auto merged
      mysys/my_write.c:
        Auto merged
      mysys/safemalloc.c:
        Auto merged
      mysys/tree.c:
        Auto merged
      mysys/typelib.c:
        Auto merged
      regex/regexec.c:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      BitKeeper/deleted/.del-compiler_warnings.supp:
        Delete: support-files/compiler_warnings.supp
      client/mysqlbinlog.cc:
        Manual merge from 4.1.
      client/sql_string.cc:
        Manual merge from 4.1.
      extra/perror.c:
        Manual merge from 4.1.
      heap/_check.c:
        Manual merge from 4.1.
      heap/hp_delete.c:
        Manual merge from 4.1.
      heap/hp_hash.c:
        Manual merge from 4.1.
      heap/hp_open.c:
        Manual merge from 4.1.
      heap/hp_rkey.c:
        Manual merge from 4.1.
      heap/hp_rrnd.c:
        Manual merge from 4.1.
      heap/hp_write.c:
        Manual merge from 4.1.
      libmysql/libmysql.c:
        Manual merge from 4.1.
      libmysqld/libmysqld.c:
        Manual merge from 4.1.
      myisam/mi_delete.c:
        Manual merge from 4.1.
      myisam/mi_dynrec.c:
        Manual merge from 4.1.
      myisam/mi_keycache.c:
        Manual merge from 4.1.
      myisam/mi_statrec.c:
        Manual merge from 4.1.
      myisammrg/myrg_extra.c:
        Manual merge from 4.1.
      mysys/hash.c:
        Manual merge from 4.1.
      mysys/list.c:
        Manual merge from 4.1.
      mysys/mf_iocache.c:
        Manual merge from 4.1.
      mysys/mf_keycache.c:
        Manual merge from 4.1.
      mysys/my_alloc.c:
        Manual merge from 4.1.
      mysys/my_fstream.c:
        Manual merge from 4.1.
      mysys/my_getwd.c:
        Manual merge from 4.1.
      mysys/my_lib.c:
        Manual merge from 4.1.
      mysys/my_lread.c:
        Manual merge from 4.1.
      mysys/my_lwrite.c:
        Manual merge from 4.1.
      mysys/my_pread.c:
        Manual merge from 4.1.
      mysys/my_read.c:
        Manual merge from 4.1.
      mysys/my_realloc.c:
        Manual merge from 4.1.
      mysys/my_seek.c:
        Manual merge from 4.1.
      mysys/raid.cc:
        Manual merge from 4.1.
      mysys/thr_lock.c:
        Manual merge from 4.1.
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Manual merge from 4.1.
      sql/ha_archive.cc:
        Manual merge from 4.1.
      sql/ha_innodb.cc:
        Manual merge from 4.1.
      sql/ha_ndbcluster.cc:
        Manual merge from 4.1.
      sql/item_subselect.cc:
        Manual merge from 4.1.
      sql/log.cc:
        Manual merge from 4.1.
      sql/log_event.cc:
        Manual merge from 4.1.
      sql/mysqld.cc:
        Manual merge from 4.1.
      sql/net_serv.cc:
        Manual merge from 4.1.
      sql/slave.cc:
        Manual merge from 4.1.
      sql/sql_cache.cc:
        Manual merge from 4.1.
      sql/sql_class.cc:
        Manual merge from 4.1.
      sql/sql_delete.cc:
        Manual merge from 4.1.
      sql/sql_parse.cc:
        Manual merge from 4.1.
      sql/sql_prepare.cc:
        Manual merge from 4.1.
      sql-common/client.c:
        Manual merge from 4.1.
      sql/sql_select.cc:
        Manual merge from 4.1.
      sql/sql_table.cc:
        Manual merge from 4.1.
      sql/sql_update.cc:
        Manual merge from 4.1.
      sql/strfunc.cc:
        Manual merge from 4.1.
      sql/table.cc:
        Manual merge from 4.1.
      sql/tztime.cc:
        Manual merge from 4.1.
      sql/unireg.cc:
        Manual merge from 4.1.
      tests/mysql_client_test.c:
        Manual merge from 4.1.
      00aaa9a3
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel · 4bcc759f
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      4bcc759f
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 940eb733
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
      
      
      940eb733
  3. 27 Mar, 2007 5 commits
    • unknown's avatar
      Fix for BUG#25082: default database change on trigger · 6a594ffd
      unknown authored
      execution breaks replication.
      
      When a stored routine is executed, we switch current
      database to the database, in which the routine
      has been created. When the stored routine finishes,
      we switch back to the original database.
      
      The problem was that if the original database does not
      exist (anymore) after routine execution, we raised an error.
      
      The fix is to report a warning, and switch to the NULL database.
      
      
      mysql-test/r/sp.result:
        Updated result file.
      mysql-test/t/sp.test:
        Added test case for BUG#25082.
      sql/mysql_priv.h:
        1. Change mysql_change_db() prototype;
        2. Polishing.
      sql/sp.cc:
        Polishing.
      sql/sp_head.cc:
        Polishing.
      sql/sql_db.cc:
        1. Polishing.
        2. Fix mysql_change_db().
      sql/sql_parse.cc:
        Polishing.
      sql/sql_show.cc:
        Polishing.
      6a594ffd
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0e625692
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      0e625692
    • unknown's avatar
      Fixes for 4.1 to be as in 5.0 and above. · 454e889f
      unknown authored
      
      client/mysql.cc:
        Fixed to be as in 5.0 and above.
      client/mysqldump.c:
        Fixed to be as in 5.0 and above.
      include/my_sys.h:
        Fixed to be as in 5.0 and above.
      mysys/my_static.c:
        Fixed to be as in 5.0 and above.
      454e889f
    • unknown's avatar
      Small fixes. · 57693826
      unknown authored
      
      sql/mysqld.cc:
        Added use of find_type_or_exit() for another option.
      sql/net_serv.cc:
        Bug in version number check, could occassionally make a tree
        red.
      57693826
    • unknown's avatar
      Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 · 14315122
      unknown authored
      into  trift-lap.fambruehe:/MySQL/M51/push-5.1
      
      
      mysql-test/t/query_cache_sql_prepare.test:
        Auto merged
      14315122
  4. 26 Mar, 2007 16 commits
  5. 25 Mar, 2007 3 commits
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · e97d0212
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      e97d0212
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user · 9f9a4556
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      9f9a4556
    • unknown's avatar
      Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb · 2e845944
      unknown authored
      into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
      
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      storage/ndb/test/src/UtilTransactions.cpp:
        Auto merged
      2e845944
  6. 24 Mar, 2007 11 commits
  7. 23 Mar, 2007 1 commit