mysql-test/r/innodb_mysql.result:
Update test results (merge from the main tree).
mysql-test/r/query_cache.result:
Update test results (merge from the main tree).
mysql-test/r/sp.result:
Update test results (merge from the main tree).
mysql-test/t/query_cache.test:
Use --echo End of to simplify future merges.
sql/handler.h:
st_table_list -> TABLE_LIST
sql/item_create.cc:
A post-merge fix (this code is in sql_yacc.yy in 5.0)
sql/rpl_utility.h:
st_table_list -> TABLE_LIST
sql/sp.cc:
A post-merge fix.
sql/sp_head.cc:
In 5.1 memdup_root returns void*.
sql/sql_show.cc:
st_table_list -> TABLE_LIST
sql/sql_show.h:
st_table_list -> TABLE_LIST
sql/sql_yacc.yy:
A post-merge fix.
sql/table.cc:
st_table_list -> TABLE_LIST
sql/table.h:
st_table_list -> TABLE_LIST
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
Changed copyright header formatting some
plugin_example.c, daemon_example.c:
Added "Copyright (C) 2006 MySQL AB" to GPL header
CMakeLists.txt:
Added GPL copyright text
client/CMakeLists.txt:
Added GPL copyright text
dbug/CMakeLists.txt:
Added GPL copyright text
extra/CMakeLists.txt:
Added GPL copyright text
extra/yassl/CMakeLists.txt:
Added GPL copyright text
extra/yassl/taocrypt/CMakeLists.txt:
Added GPL copyright text
libmysql/CMakeLists.txt:
Added GPL copyright text
libmysqld/CMakeLists.txt:
Added GPL copyright text
libmysqld/examples/CMakeLists.txt:
Added GPL copyright text
mysys/CMakeLists.txt:
Added GPL copyright text
regex/CMakeLists.txt:
Added GPL copyright text
server-tools/instance-manager/CMakeLists.txt:
Added GPL copyright text
sql/CMakeLists.txt:
Added GPL copyright text
storage/archive/CMakeLists.txt:
Added GPL copyright text
storage/blackhole/CMakeLists.txt:
Added GPL copyright text
storage/csv/CMakeLists.txt:
Added GPL copyright text
storage/example/CMakeLists.txt:
Added GPL copyright text
storage/federated/CMakeLists.txt:
Added GPL copyright text
storage/heap/CMakeLists.txt:
Added GPL copyright text
storage/innobase/CMakeLists.txt:
Added GPL copyright text
storage/myisam/CMakeLists.txt:
Added GPL copyright text
storage/myisammrg/CMakeLists.txt:
Added GPL copyright text
strings/CMakeLists.txt:
Added GPL copyright text
tests/CMakeLists.txt:
Added GPL copyright text
vio/CMakeLists.txt:
Added GPL copyright text
zlib/CMakeLists.txt:
Added GPL copyright text
include/my_vle.h:
Changed copyright header formatting some
mysys/my_vle.c:
Changed copyright header formatting some
plugin/daemon_example/daemon_example.c:
Added "Copyright (C) 2006 MySQL AB" to GPL header
plugin/fulltext/plugin_example.c:
Added "Copyright (C) 2006 MySQL AB" to GPL header
plugin/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/authors.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/contributors.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item_xmlfunc.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/partition_element.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/partition_info.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/rpl_injector.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/rpl_injector.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_binlog.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_servers.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
storage/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
storage/archive/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
storage/blackhole/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
storage/csv/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
storage/example/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
storage/federated/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
win/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/rpl_utility.cc:
Changed copyright header formatting some
sql/rpl_utility.h:
Changed copyright header formatting some
unittest/mysys/base64-t.c:
Changed copyright header formatting some
include/my_uctype.h:
Added GPL copyright text
plugin/daemon_example/Makefile.am:
Added GPL copyright text
plugin/fulltext/Makefile.am:
Added GPL copyright text
scripts/make_win_bin_dist:
Added GPL copyright text
server-tools/instance-manager/user_management_commands.cc:
Added GPL copyright text
sql/sql_builtin.cc.in:
Added GPL copyright text
sql/sql_show.h:
Added GPL copyright text
storage/archive/archive_test.c:
Added GPL copyright text
storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp:
Added GPL copyright text
storage/ndb/src/kernel/blocks/diskpage.cpp:
Added GPL copyright text
storage/ndb/src/kernel/vm/Rope.cpp:
Added GPL copyright text
storage/ndb/src/mgmsrv/ParamInfo.hpp:
Added GPL copyright text
strings/uctypedump.c:
Added GPL copyright text
unittest/Makefile.am:
Added GPL copyright text
unittest/examples/Makefile.am:
Added GPL copyright text
unittest/examples/core-t.c:
Added GPL copyright text
unittest/examples/no_plan-t.c:
Added GPL copyright text
unittest/examples/simple-t.c:
Added GPL copyright text
unittest/examples/skip-t.c:
Added GPL copyright text
unittest/examples/skip_all-t.c:
Added GPL copyright text
unittest/examples/todo-t.c:
Added GPL copyright text
unittest/mysys/Makefile.am:
Added GPL copyright text
unittest/mytap/Makefile.am:
Added GPL copyright text
unittest/mytap/t/Makefile.am:
Added GPL copyright text
unittest/mytap/t/basic-t.c:
Added GPL copyright text
unittest/unit.pl:
Added GPL copyright text
win/build-vs71.bat:
Added GPL copyright text
win/build-vs8.bat:
Added GPL copyright text
win/configure.js:
Added GPL copyright text
Cut number 6. Move code from sql_show.cc to event_db_repository.cc
that more belongs to the latter.
sql/event_db_repository.cc:
move code that works with mysql.event from sql_show.cc to
event_db_repository.cc . Route through Event_db_repository's interface
which is proxied by class Events. The code relies on a function from
sql_show.cc which does the actual storage in the schema table. I think
it's better to leave the function there because the structure of
I_S.EVENTS is defined in sql_show.cc
sql/event_db_repository.h:
I_S / SHOW EVENTS handling hooks
sql/event_scheduler.cc:
use the pointer to db_repository which Event_scheduler already has
sql/events.cc:
Put a comment to get_instance
sql/events.h:
callback for I_S (sql_show.cc)
sql/sql_show.cc:
move code that belongs more to Event_db_repository than to here.
Use a callback of class Events. Only 1 function is left here, because
it copies data into the actual rows of I_S.EVENTS and belongs to this file.
sql/sql_show.h:
export this function will be called from event_db_repository.cc