3142 Luis Soares 2009-11-13
BUG#48048: Deprecated constructs need removal in Betony
Post-push fix: Reverting change in Makefile.am which was
causing windows not to build client/.
modified:
client/Makefile.am
3141 Luis Soares 2009-11-13 [merge]
manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)
CONFLICTS
=========
Text conflict in sql/sql_yacc.yy
1 conflicts encountered.
removed:
mysql-test/suite/rpl/r/rpl_empty_master_crash.result
mysql-test/suite/rpl/r/rpl_load_from_master.result
mysql-test/suite/rpl/r/rpl_load_table_from_master.result
mysql-test/suite/rpl/t/rpl000017-slave.opt
mysql-test/suite/rpl/t/rpl_empty_master_crash-master.opt
mysql-test/suite/rpl/t/rpl_empty_master_crash.test
mysql-test/suite/rpl/t/rpl_load_from_master.test
mysql-test/suite/rpl/t/rpl_load_table_from_master.test
mysql-test/t/backup-master.sh
mysql-test/t/backup.test
added:
mysql-test/r/deprecated_features.result
mysql-test/t/deprecated_features.test
modified:
client/Makefile.am
mysql-test/extra/rpl_tests/rpl_reset_slave.test
mysql-test/include/master-slave-reset.inc
mysql-test/include/master-slave.inc
mysql-test/include/not_ndb_default.inc
mysql-test/mysql-test-run.pl
mysql-test/r/flush2.result
mysql-test/r/ps_1general.result
mysql-test/r/show_check.result
mysql-test/r/sp-code.result
mysql-test/r/sp-error.result
mysql-test/r/sp.result
mysql-test/r/sp_trans.result
mysql-test/r/type_blob.result
mysql-test/r/type_timestamp.result
mysql-test/r/warnings.result
mysql-test/suite/rpl/my.cnf
mysql-test/suite/rpl/r/rpl000017.result
mysql-test/suite/rpl/r/rpl_000015.result
mysql-test/suite/rpl/r/rpl_bug33931.result
mysql-test/suite/rpl/r/rpl_heartbeat.result
mysql-test/suite/rpl/r/rpl_row_reset_slave.result
mysql-test/suite/rpl/r/rpl_sp.result
mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
mysql-test/suite/rpl/t/rpl000017.test
mysql-test/suite/rpl/t/rpl_000015-slave.opt
mysql-test/suite/rpl/t/rpl_000015.test
mysql-test/suite/rpl/t/rpl_bug33931.test
mysql-test/suite/rpl/t/rpl_sp-master.opt
mysql-test/suite/rpl/t/rpl_sp-slave.opt
mysql-test/suite/rpl/t/rpl_sp.test
mysql-test/suite/rpl_ndb/my.cnf
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf
mysql-test/t/ps_1general.test
mysql-test/t/show_check.test
mysql-test/t/sp-error.test
mysql-test/t/sp.test
mysql-test/t/sp_trans.test
mysql-test/t/system_mysql_db_fix40123.test
mysql-test/t/system_mysql_db_fix50030.test
mysql-test/t/system_mysql_db_fix50117.test
mysql-test/t/type_blob.test
mysql-test/t/type_timestamp.test
mysql-test/t/warnings.test
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_fix.sql
sql/handler.cc
sql/handler.h
sql/lex.h
sql/mysql_priv.h
sql/mysqld.cc
sql/repl_failsafe.cc
sql/rpl_mi.cc
sql/rpl_mi.h
sql/set_var.cc
sql/set_var.h
sql/share/errmsg.txt
sql/slave.cc
sql/sp_head.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_repl.cc
sql/sql_show.cc
sql/sql_table.cc
sql/sql_yacc.yy
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.h
tests/mysql_client_test.c
=== modified file 'client/Makefile.am'
--- a/client/Makefile.am 2009-11-13 10:17:53 +0000
+++ b/client/Makefile.am 2009-11-13 12:14:38 +0000
@@ -34,7 +34,7 @@ LDADD= @CLIENT_EXTRA_LDFLAGS@ $(CLIEN
noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \
client_priv.h
-EXTRA_DIST = echo.c
+EXTRA_DIST = get_password.c CMakeLists.txt echo.c
BUILT_SOURCES = link_sources
Attachment: [text/bzr-bundle] bzr/luis.soares@sun.com-20091113121438-ufogz86vcny1w22w.bundle
| Thread |
|---|
| • bzr push into mysql-5.1-rep+2 branch (luis.soares:3141 to 3142)Bug#48048 | Luis Soares | 13 Nov |
