old upgrade behaviour.
Add test for upgrade from 5.0.30
mysql-test/t/system_mysql_db_fix40123.test:
Drop alos the new 5.1 tables after test
scripts/mysql_fix_privilege_tables.sql:
Update 5.1 version of mysql_fix_privilege_tables.sql to also do
an "ALTER TABLE MODIFY" on the new column(s) it adds. This allows us to
make sure that both new and already existing columsn get the right type.
mysql-test/t/system_mysql_db_fix50030-master.opt:
New BitKeeper file ``mysql-test/t/system_mysql_db_fix50030-master.opt''
mysql-test/t/system_mysql_db_fix50030.test:
New BitKeeper file ``mysql-test/t/system_mysql_db_fix50030.test''
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
client/mysql_upgrade.c:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
columns to make sure they both exist and have the intended type
scripts/mysql_fix_privilege_tables.sql:
Can't attempt to MODIFY columns of a table before they exists. The
new column's Create_view_priv,Show_view_priv, Create_routine_priv,
Alter_routine_priv and Create_user_priv might not exists when
upgrading. Thus an ALTER TABLE MODIFY is added in addition to the
ALTER TABLE ADD that would have added them if they didn't exist.
In this way can be sure the columns both exist and are of the correct type
"Y" are different) to utf8_general_ci (where same).
scripts/mysql_fix_privilege_tables.sql:
Change collation for ALTER-omitted ENUMs from utf8_bin (where "y" and
"Y" are different) to utf8_general_ci (where same). In the previous
statement, we clobber the collation to utf8_bin for all columns, and
that's the wrong thing to do for enums.
with embedded spaces
Problem: Original code written assuming password contains no spaces.
Further, because of how sh interprets characters in variables, you
cannot do the "simple solution".
Solution: Move the "was a password provided" check to the end. This
allows us to correctly quote the password argument when passed to the
mysql client program. Addendum: Put this check inside of a shell fn
to simplify the code.
scripts/mysql_fix_privilege_tables.sh:
Moved password existence check to end to allow for passwords with
with embedded spaces.
Added LICENSE.mysql, removed LICENSE.doc README.NW.
Removed obselete section about MySQLEULA.txt and README.NW.
README:
Added reference to the EXCEPTIONS-CLIENT file.
Changed reference to the commercial license file.
Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
Delete: Docs/MySQLEULA.txt
README:
Added reference to the EXCEPTIONS-CLIENT file.
Changed reference to the commercial license file.
Corrected references into chapters in the manual.
BitKeeper/deleted/.del-MySQLEULA.txt~4a1afd9284f9be5a:
Delete: Docs/MySQLEULA.txt
scripts/make_binary_distribution.sh:
Added LICENSE.mysql, removed LICENSE.doc README.NW.
Removed obselete section about MySQLEULA.txt and README.NW.
Copy udf examples and raid.h
Create target "include" directory before copying files to it
CMakeLists.txt:
Only compile in bdb if configured
configure.in:
Raised version number to 5.0.27
scripts/make_win_bin_dist:
Copy udf examples and raid.h
Create target "include" directory before copying files to it
CMakeLists.txt:
Only compile in bdb if configured
configure.in:
Raised version number to 5.0.27
Update make_binary_distribution.sh
Make sure all files needed for testing are included
scripts/make_binary_distribution.sh:
Make sure all files needed for testing are included
Split copy of result files to avoid shell limit.
Added copy of mysql-test/std_data/ndb_backup5{0,1}.
configure.in:
Look for dlopen() even if --with-mysqld-ldflags constains "-static",
as this is not the same as the flag to "ld", it just informs
"libtool" to link static with libraries created part of the build,
even if there exists shared versions.
configure.in:
Look for dlopen() even if --with-mysqld-ldflags constains "-static",
as this is not the same as the flag to "ld", it just informs
"libtool" to link static with libraries created part of the build,
even if there exists shared versions.
scripts/make_binary_distribution.sh:
Split copy of result files to avoid shell limit.
Added copy of mysql-test/std_data/ndb_backup5{0,1}.
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
BitKeeper/etc/collapsed:
auto-union
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
include/m_ctype.h:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
Filter out icc specific options from cflags/libs(_r)
scripts/mysql_config.sh:
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
Added "test" RPM package
Install all binaries "make install" would
make_binary_distribution.sh:
Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
scripts/make_binary_distribution.sh:
Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
support-files/mysql.spec.sh:
Removed the rest of the "bench" sub RPM, but added a new "test" sub
RPM containing the "mysql-test" directory earlier in the "bench" sub
RPM. The new sub RPM "Obsoltes" "mysql-bench" as well.
Added the rest of the binaries that "make install" would install
bin/ndb_print_backup_file
bin/ndb_print_schema_file
bin/ndb_print_sys_file
sbin/ndb_cpcd
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/config:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/Makefile.am:
Auto merged
vio/viosocket.c:
Auto merged
scripts/make_win_bin_dist:
BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/scripts/make_win_bin_dist
client/mysqlbinlog.cc:
Fix for cmake build: Cmake doesn't use the VC++ files
extra/comp_err.c:
fixed windows crash (debug): We can't call DBUG_RETURN after my_end.
include/my_dbug.h:
added missing empty define for DBUG_LEAVE to prevent precompiler errors when
compiling in non_debug mode
mysql-test/mysql-test-run.pl:
Added support for new cmake release and debug paths.
mysql-test/t/system_mysql_db_fix.test:
This test requires unix shell script mysql_fix_previleges_tables -> skip under windows
mysys/my_seek.c:
Fix for windows debug crash. However this solution is bad: we should never
call lseek with an invalid file pointer.
sql/ha_archive.cc:
Fixed windows crash: We need dup in gzdopen to keep the filehandle open,
otherwise subsequent calls to mysql_close will fail/crash.
into zim.(none):/home/brian/mysql/remove-bdb-5.1
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/backup.result:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/federated_transactions.test:
Merge
into zim.(none):/home/brian/mysql/dep-5.1
client/mysql.cc:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/repair.test:
Auto merged
scripts/fill_func_tables.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/heap/hp_delete.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/sort.c:
Auto merged
mysql-test/r/mysqldump.result:
Fixing Result
mysql-test/r/repair.result:
Fixing result
mysql-test/t/mysqldump.test:
Merging change
storage/archive/ha_archive.cc:
Merging in change
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
mysql-test/t/warnings.test:
Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/r/sp.result:
Manual merge. Place 5.0 test before 5.1 test.
mysql-test/t/sp.test:
Manual merge. Place 5.0 test before 5.1 test.
mysys/my_bitmap.c:
Manual merge.
scripts/make_binary_distribution.sh:
Manual merge.
sql/Makefile.am:
Manual merge.
sql/slave.cc:
Manual merge.
sql/sql_class.h:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_select.cc:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
mysql-test/Makefile.am:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
client/mysqltest.c:
Manual merge
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
configure.in:
Auto merged
man/Makefile.am:
Auto merged
mysys/my_bitmap.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql/sql_locale.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/t/mysqlbinlog.test:
Manual merge.
sql/sql_select.cc:
Manual merge.
into rama.(none):/home/jimw/my/mysql-5.1-clean
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
extra/yassl/src/template_instnt.cpp:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/embedded_priv.h:
Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/mysqldump-max.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/time.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
BitKeeper/deleted/.del-have_case_sensitive_file_system.inc:
Delete: mysql-test/include/have_case_sensitive_file_system.inc
BitKeeper/deleted/.del-case_sensitive_file_system.require:
Delete: mysql-test/r/case_sensitive_file_system.require
mysql-test/lib/mtr_cases.pl:
Resolve conflict
mysql-test/mysql-test-run.pl:
Resolve conflict
mysql-test/r/mysqldump.result:
Resolve conflict
mysql-test/t/mysqldump.test:
Resolve conflict
sql/sql_parse.cc:
Resolve conflict
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
configure.in:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
SCCS merged
Man page for "mysqld" command move to section 8 (bug#21220)
scripts/make_binary_distribution.sh:
Man page for "mysqld" command move to section 8 (bug#21220)
scripts/mysqlhotcopy.sh:
Defined new raid directory regular expression variable that allows a mix of two alphanumeric characters. Replaced hardcode raid directory regular expressions with new variable.
- The mysql-test/std_data/bug15328.cnf file was not copied to install or dist dir.
mysql-test/Makefile.am:
Add std_data/*.cnf files to dist_hook and install-data-local
scripts/make_win_src_distribution.sh:
Copy *.cnf files as well.
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
client/mysql.cc:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/time.cc:
Auto merged
Minor script changes for uniformity.
scripts/fill_func_tables.sh:
Switched to standard !@PERL@ usage. Added Copyright and more specific original author information.
scripts/mysql_install_db.sh:
Removed leading empty line.
