EXCEPTIONS-CLIENT is now static part of repository
EXCEPTIONS-CLIENT:
BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT
EXCEPTIONS-CLIENT:
BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT
Docs/Makefile.am:
EXCEPTIONS-CLIENT is now static part of repository
client/mysql_upgrade.c:
Fixed problem with mysql_upgrade being dependent
on local my.cnf files and problem with memory not being freed.
client/mysqltest.c:
Changed type to avoid warning.
cmd-line-utils/readline/xmalloc.c:
Fix to avoid warning.
include/my_dbug.h:
To disable parts from code in non-debug more.
sql/field.cc:
Fixed warning.
sql/ha_archive.cc:
Fixed warning.
sql/ha_berkeley.cc:
Added casts to avoid warnings.
sql/ha_ndbcluster.cc:
Fixed warnings.
sql/log.cc:
Added casts to avoid warnings.
sql/slave.cc:
Avoid warning.
sql/sql_repl.cc:
Avoid warning.
support-files/compiler_warnings.supp:
Added disabled warnings to compiler_warnings.supp file.
These are backported mainly from 5.1 suppress file, but there
are some additional new ones.
- Tell the programs executed by mysql_upgrade to only read
from the defaults file generated by msyql_upgrade
- Fix memory leaks
client/mysql_upgrade.c:
- Always generate defaults file used for the programs executed
by mysql_upgrade.
- Set the executed programs to read options _only_ from the
generated defaults file
- Add DBUG printouts
- Add comments
- Fix memory leaks
- Change one 'my_delete'(delete a file) to 'my_free'(free memory)
- Free memory allocated by 'load_default'
- No .sql files in mysql-test/lib/ anymore, don't copy them
scripts/make_binary_distribution.sh:
No need to copy mysql-test/lib/*.sql there are no sql files there anymore
scripts/make_win_bin_dist:
No need to copy mysql-test/lib/*.sql there are no sql files there anymore
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql:
Auto merged
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysqld.cc:
Auto merged
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
mysql-test/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
BitKeeper/deleted/.del-init_db.sql:
Auto merged
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Auto merged
- Add printout of current time when mysqld is killed by an
unhandled signal
sql/mysqld.cc:
Add printout of current time before the "mysqld got signal %d" message
Hopefully we don't crash in the calls to 'time' or 'localtime_r'
but if that should start to happen we can move the printout of
time further down. At least it's now below the check for segfault
inside of segfault handler.
Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
Positions of some binlog events were changed because of
additional logging of @@collation_database.
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql:
Auto merged
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
- Build lib/init-db.sql from the output of mysql_create_system_tables
- Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
- Leave netware/init_db.sql until 5.0 where we should soon have possibility
to test with mysql-test-run.pl
BitKeeper/deleted/.del-init_db.sql:
Delete: mysql-test/init_db.sql
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Delete: mysql-test/lib/init_db.sql
BitKeeper/etc/ignore:
Added mysql-test/lib/init_db.sql to the ignore list
mysql-test/Makefile.am:
Build lib/init_db.sql from the output of mysql_create_system_tables
- Split out initial data in mysql_system_tables.sql to it's own file
- Use file from mysql_install_db and mysql-test-run
scripts/mysql_system_tables_fix.sql:
Rename: scripts/mysql_fix_privilege_tables.sql.in -> scripts/mysql_system_tables_fix.sql
mysql-test/mysql-test-run.pl:
- Add mysql_system_tables_data.sql as part of the bootstrap
- Remove the addition of pid to end of bootstrap.sql, now
to file used for bootstrap will be $opt_vardir/tmp/bootstrap.sql
- Improve error message descibing how to find cause of a
failed bootstrap
scripts/Makefile.am:
- Rename mysql_fix_privileg_tables.sql.in to mysql_system_tables_fix.sql
- Build mysql_fix_privilege_tables from mysql_system_tables.sql and
mysql_system_tables_fix.sql
- Add mysql_system_tables_fix.sql to EXTRA_DIST
scripts/mysql_install_db.sh:
- Use mysql_system_tables_data.sql file when bootstrapping
mysql, it will contain initial data for MysQL system tables
scripts/mysql_system_tables.sql:
Move initial data for system tables to it's own file
scripts/mysql_system_tables_data.sql:
Move initial data for system tables to it's own file
into mysql.com:/home/bar/mysql-5.0.b15126
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/mysqlbinlog.result:
After merge fix
mysql-test/t/mysqlbinlog.test:
After merge fix
This patch fixes problem that LOAD DATA could use different
character sets when loading files on master and on slave sides:
- Adding replication of thd->variables.collation_database
- Adding optional character set clause into LOAD DATA
Note, the second way, with explicit CHARACTER SET clause
should be the recommended way to load data using an alternative
character set.
The old way, using "SET @@character_set_database=xxx" should be
gradually depricated.
mysql-test/r/mysqlbinlog.result:
Adding test case
mysql-test/t/mysqlbinlog.test:
Adding test case
sql/log_event.cc:
Adding logging of thd->variables.collation_database
sql/log_event.h:
Adding declarations
sql/sql_class.cc:
Exchange character set is null by default
sql/sql_class.h:
Adding character set into sql_exchange
sql/sql_load.cc:
- Using exchange character set (if it was specified in LOAD DATA syntax)
- Using thd->variables.collation_database by default
sql/sql_yacc.yy:
Adding optional character set clause into LOAD DATA syntax
mysql-test/r/rpl_loaddata2.result:
New BitKeeper file ``mysql-test/r/rpl_loaddata2.result''
mysql-test/std_data/loaddata6.dat:
New BitKeeper file ``mysql-test/std_data/loaddata6.dat''
mysql-test/t/rpl_loaddata2.test:
New BitKeeper file ``mysql-test/t/rpl_loaddata2.test''
- Add error handling for waitpid returns -1 for "simple run of command"
mysql-test/lib/mtr_process.pl:
- Add error handling for waitpid returns -1
when a simple command is run.
- Add missing return
- Add mtr_errors where the program should never come
- Remove an else to improve program readability
- Change mtr_debug to mtr_warning for "Got EAGAIN from fork()..."
into mysql.com:/home/ram/work/b26038/b26038.5.0
sql/item_geofunc.cc:
Auto merged
sql/spatial.cc:
Auto merged
sql/spatial.h:
Auto merged
mysql-test/r/gis.result:
will be fixed after the merging.
mysql-test/t/gis.test:
merging, the result will be fixed in an after-merge fix CS
sql/item_geofunc.h:
merging
- Use "mysql_stmt_field_count" to determine if there is a need to
call "mysql_stmt_store_result"
client/mysqltest.c:
Only call 'mysql_stmt_store_result' if 'mysql_stmt_field_count' is
greater than 0 indicating that this query has a result set.
This change is mainly since if mysql_stmt_store_result fails
the value returned by mysql_stmt_field_count will be reset.
