Commit graph

16197 commits

Author SHA1 Message Date
unknown
c9f0aaa653 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1


sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2004-12-03 22:13:53 +02:00
unknown
67aec82f79 Fix t/rpl_create_database.test: replace version in SHOW BINLOG RESULTS
mysql-test/t/rpl_create_database.test:
  need to replace version in results
mysql-test/r/rpl_create_database.result:
  version gets replaced
2004-12-03 18:42:35 +01:00
unknown
a1fb39e7ba Merge
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_class.h:
  SCCS merged
2004-12-03 17:48:19 +01:00
unknown
0284e541b3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-03 16:10:20 +01:00
unknown
3456a512d9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-03 15:43:26 +01:00
unknown
684f91e6ce Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-03 15:38:07 +01:00
unknown
68755d7f59 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_insert.cc:
  Auto merged
2004-12-03 15:05:35 +01:00
unknown
390f680016 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-03 15:04:06 +01:00
unknown
dea513dd12 sql/sql_class.h
Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
sql/sql_insert.cc
    Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part


sql/sql_class.h:
  Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
sql/sql_insert.cc:
  Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
2004-12-03 15:02:29 +01:00
unknown
b1f4a482f4 ndb - fix in test suite
ndb/test/src/NDBT_Test.cpp:
  clear threads when finished waiting
2004-12-03 15:02:07 +01:00
unknown
8f063cecb8 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-12-03 15:00:57 +01:00
unknown
c9215dc241 ndb: failed update updated tuple version. crash at DbtupTrigger.cpp 1102
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  failed update updated tuple version. crash at DbtupTrigger.cpp 1102
2004-12-03 15:00:56 +01:00
unknown
abf0ab9eee Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1testtemp
2004-12-03 17:03:24 +05:00
unknown
465961799a added project files of mysqltest and mysql_test_run_new 2004-12-03 16:59:49 +05:00
unknown
eb21ec54c8 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2004-12-03 12:51:38 +01:00
unknown
abb1963df3 ndb - fix abort of scan when in WAIT_AI_SCAN state
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure to release all resources when aborting scan
    in state WAIT_AI_SCAN
2004-12-03 12:45:51 +01:00
unknown
72d5625378 Merge mysql.com:/space/bkroot/mysql-4.1
into mysql.com:/space/bk/b6391-mysql-4.1


sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2004-12-03 12:15:31 +01:00
unknown
220acb328e Bug#6391 (binlog-do-db rules ignored)
CREATE DATABASE statement used the current database instead of the
  database created when checking conditions for replication.
  CREATE/DROP/ALTER DATABASE statements are now replicated based on
  the manipulated database.


mysql-test/t/rpl_until.test:
  Longer sleep to allow slave to stop.
mysql-test/t/rpl_charset.test:
  Position change in binary file.
mysql-test/r/drop_temp_table.result:
  Position change in binlog.
mysql-test/r/rpl_loaddata_rule_m.result:
  Position change in binlog.
mysql-test/r/rpl_charset.result:
  Position change in binlog.
sql/log_event.h:
  Added new flag and parameter to suppress generation of
  USE statements.
sql/log_event.cc:
  Added parameter and code to suppress generation of
  USE statements.
sql/sql_db.cc:
  Suppress generation of USE before CREATE/ALTER/DROP DATABASE
  statements.
sql/log.cc:
  Query_log_event have new extra parameter.
sql/sql_table.cc:
  Query_log_event have new extra parameter.
sql/sql_base.cc:
  Query_log_event have new extra parameter.
sql/sql_update.cc:
  Query_log_event have new extra parameter.
sql/sql_insert.cc:
  Query_log_event have new extra parameter.
sql/sql_rename.cc:
  Query_log_event have new extra parameter.
sql/sql_delete.cc:
  Query_log_event have new extra parameter.
sql/sql_acl.cc:
  Query_log_event have new extra parameter.
sql/handler.cc:
  Query_log_event have new extra parameter.
sql/item_func.cc:
  Query_log_event have new extra parameter.
sql/sql_parse.cc:
  Query_log_event have new extra parameter.
2004-12-03 12:13:51 +01:00
unknown
8948b7450f Manual fixes to merge of fix for Bug #6682 to 4.1.
sql/sql_class.h:
  update tmp_disable_binlog() and reenable_binlog() macros
mysql-test/r/insert_select.result:
  Handle results that differ from 4.0 to 4.1
2004-12-03 02:44:33 +01:00
unknown
117c7611a7 Merge
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/t/insert_select.test:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/r/insert_select.result:
  SCCS merged
sql/sql_insert.cc:
  merge changes
sql/sql_table.cc:
  e
  merge changes
2004-12-03 00:39:55 +01:00
unknown
9286d1c145 Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the
insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682)
(Original fix reimplemented after review by Serg and Guilhem.)


mysql-test/t/insert_select.test:
  Add test case for Bug #6682
mysql-test/r/insert_select.result:
  Add results for test case for Bug #6682
sql/sql_table.cc:
  moved tmp_disable_binlog() and reenable_binlog macros to sql/sql_class.h
sql/sql_insert.cc:
  disable binlog during call to super's ::send_error in select_create class
sql/sql_class.h:
  add select_create::send_error()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-03 00:05:11 +01:00
unknown
5fc09be9a3 - updated lowercase_table3 test result (T1.InnoDB -> T1.ibd). Failure was
discovered on Mac OS X


mysql-test/r/lowercase_table3.result:
  - updated test result (T1.InnoDB -> T1.ibd). Failure was discovered on
    Mac OS X
2004-12-02 21:32:36 +01:00
unknown
d1964f4163 compatibility fix 2004-12-02 20:53:54 +01:00
unknown
f4326e7e9c Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-12-02 19:11:35 +01:00
unknown
93de638b17 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2004-12-02 18:56:58 +01:00
unknown
fbafcb2c0e - added option --with-archive to enable compiling with the Archive Storage
Engine
2004-12-02 18:55:10 +01:00
unknown
d3b6349ad8 Change to prevent the failure of "make distclean" on the missing 'regex/Makefile' (and, later, 'strings/Makefile').
configure.in:
  The subdirectories 'strings' and 'regex' were each contained in both the 'sql_client_dirs' and the 'sql_server_dirs' macro.
  As these are used to form the (Makefile) macro 'SUBDIRS' and 'DIST_SUBDIRS', these subdirectories will get listed there twice.
  This causes a failure of the (recursive) "make distclean", so this double inclusion must be prevented.
2004-12-02 16:42:37 +01:00
unknown
3f8262e091 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-12-02 16:30:34 +01:00
unknown
a29516cb34 Merge bk-internal:/home/bk/mysql-4.1
into build.mysql.com:/users/tsmith/m/41/b
2004-12-02 15:48:02 +01:00
unknown
fc9d5dee42 Merge bk-internal:/home/bk/mysql-4.1
into build.mysql.com:/users/tsmith/m/41/b


client/mysqldump.c:
  Auto merged
2004-12-02 15:33:12 +01:00
unknown
078e71df51 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-12-02 16:14:37 +02:00
unknown
66c3afa363 myisam/mi_packrec.c
more robust checks (catch more corruptions)


myisam/mi_packrec.c:
  more robust checks (catch more corruptions)
2004-12-02 15:14:36 +01:00
unknown
ab762690c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-02 14:14:02 +01:00
unknown
374252c686 merge (new code fixed the ALTER TABLE problem) 2004-12-02 15:14:01 +02:00
unknown
35f9ecc1ce merged on pull
mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/type_enum.result:
  merged test cases
mysql-test/t/type_enum.test:
  merged test cases
2004-12-02 14:47:14 +02:00
unknown
646deed9f7 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-02 16:46:30 +04:00
unknown
93cf297fcb Cleanups during review stage
Added auto-correct of field length for enum/set tables for ALTER TABLE
This is becasue of a bug in previous MySQL 4.1 versions where the length for enum/set was set incorrectly after ALTER TABLE


mysql-test/r/rpl_start_stop_slave.result:
  Fixed wrong test
mysql-test/r/type_enum.result:
  Added test for wrong enum/set length after alter table
mysql-test/t/ps.test:
  removed empty line
mysql-test/t/type_enum.test:
  Added test for wrong enum/set length after alter table
sql/field.cc:
  Added auto-correct of field length for enum/set tables.
  This is becasue of a bug in previous MySQL 4.1 versions where the length for enum/set was set incorrectly after ALTER TABLE
sql/item_cmpfunc.cc:
  Simple optimization
sql/mysql_priv.h:
  Made local function global
sql/set_var.cc:
  Simple cleanup
sql/sql_table.cc:
  Simple cleanups & optimizations
2004-12-02 14:43:51 +02:00
unknown
d3c5c4997c Fixes to make mysql-test-run --embedded-server working
mysql-test/mysql-test-run.sh:
  Tests that can't be fixed now showed in the ignore-list
mysql-test/r/query_cache.result.es:
  test result renewed
mysql-test/r/select.result.es:
  test result renewed
mysql-test/r/type_blob.result.es:
  test result renewed
mysql-test/r/type_float.result.es:
  test result renewed
sql/sql_prepare.cc:
  time values sending fixed
tests/client_test.c:
  that doesnt work in embedded server
BitKeeper/etc/ignore:
  Added libmysqld/ha_archive.cc libmysqld/ha_example.cc libmysqld/ha_tina.cc to the ignore list
2004-12-02 16:08:17 +04:00
unknown
533f1488e7 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-12-02 12:58:25 +01:00
unknown
f36f636408 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-02 15:38:53 +04:00
unknown
29b3ae4dd4 Fix for Bug#6377 "Password Generation Discrepancy"
client/mysqladmin.cc:
  Fix for Bug#6377 "Password Generation Discrepancy":
  this is not a MySQL bug.
  The problem is that Windows command line client doesn't trim single quotes
  from arguments, as any UNIX shell does.
  The fix just checks for this condition and gives a warning if it is true.
2004-12-02 14:28:59 +03:00
unknown
33a4b35ec8 A fix (bug #6878: Crash with engine=memory).
heap/hp_create.c:
  A fix (bug #6878: Crash with engine=memory).
  Record length should be >= sizeof(byte*).
2004-12-02 15:06:15 +04:00
unknown
e9ee29ff51 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-12-02 12:01:38 +01:00
unknown
3848713956 merge (fix for bug #6878: Crash with engine=memory) 2004-12-02 14:56:46 +04:00
unknown
d0a47dbf72 mysqld.cc:
innodb_autoextend_increment: set a maximum limit of 1000 (Bug #6904)


sql/mysqld.cc:
  innodb_autoextend_increment: set a maximum limit of 1000 (Bug #6904)
2004-12-02 12:40:25 +02:00
unknown
a845e882fd A fix (bug #6878: Crash with engine=memory).
heap/hp_open.c:
  A fix (bug #6878: Crash with engine=memory).
  Record length should be >= sizeof(byte*).
2004-12-02 14:34:53 +04:00
unknown
491a3d90a9 Fixes (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv
bug #6933: error in the tests/grant.pl test).


mysql-test/r/grant.result:
  A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv).
mysql-test/t/grant.test:
  A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv).
sql/sql_acl.cc:
  A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv).
  The problem is that we use whole key length (including 'Column_name' keypart)                          
  during scanning the 'columns_priv' table in case of revoke_grant.
tests/grant.pl:
  A fix (bug #6933: error in the tests/grant.pl test).
2004-12-02 13:34:30 +04:00
unknown
6f20687e20 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1-enum
2004-12-02 13:34:28 +04:00
unknown
39d62ccc93 mgmapi.cpp:
bug #6919


ndb/src/mgmapi/mgmapi.cpp:
  bug #6919
2004-12-02 09:34:27 +00:00
unknown
c59d473b02 - fixed file permissions (need execute bits set)
BUILD/compile-ppc-debug-max:
  Change mode to -rwxrwxr-x
BUILD/compile-ppc-debug:
  Change mode to -rwxrwxr-x
BUILD/compile-ppc-max:
  Change mode to -rwxrwxr-x
BUILD/compile-ppc:
  Change mode to -rwxrwxr-x
2004-12-02 10:11:28 +01:00