Commit graph

50036 commits

Author SHA1 Message Date
unknown
76e37a32b8 Merge gleb.loc:/home/uchum/work/bk/5.0
into  gleb.loc:/home/uchum/work/bk/5.0-opt


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
2007-09-06 22:27:13 +05:00
unknown
d7262773e1 sql_parse.cc:
Post-merge fix.


sql/sql_parse.cc:
  Post-merge fix.
2007-09-06 21:56:46 +05:00
unknown
9179dc33b9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
2007-09-06 13:28:00 -03:00
unknown
16c328056c The test case for bug 28587 doesn't work with the embedded version,
the first query is not running while we are doing wait queries on
a second connection.


mysql-test/r/insert_notembedded.result:
  Test case result for bug 28587 moved from insert_update.result
mysql-test/r/insert_update.result:
  Remove test case result for bug 28587, moving to insert_notembedded.result
mysql-test/t/insert_notembedded.test:
  Test case result for bug 28587, moved from insert_update.test
mysql-test/t/insert_update.test:
  Remove test case for bug 28587, moving to insert_notembedded.test
2007-09-06 13:22:34 -03:00
unknown
d9a7fd12ff sp.result:
Post-merge fix.


mysql-test/r/sp.result:
  Post-merge fix.
2007-09-06 20:42:36 +05:00
unknown
414d345071 Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/distinct.result:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/include/mix1.inc:
  Merge with 5.0-opt.
mysql-test/r/group_by.result:
  Merge with 5.0-opt.
mysql-test/r/innodb_mysql.result:
  Merge with 5.0-opt.
mysql-test/r/sp.result:
  Merge with 5.0-opt.
mysql-test/t/group_by.test:
  Merge with 5.0-opt.
mysql-test/t/sp.test:
  Merge with 5.0-opt.
sql/sql_parse.cc:
  Merge with 5.0-opt.
sql/sql_select.cc:
  Merge with 5.0-opt.
sql/sql_view.cc:
  Merge with 5.0-opt.
2007-09-06 19:15:31 +05:00
unknown
ed34d91121 Make events.test more robust against timing issues.
mysql-test/t/events.test:
  Wait until event scheduler thread reaches exactly the same state
  which later appears in the results of select from processlist.
2007-09-06 15:57:36 +04:00
unknown
c626f660de Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-09-06 10:23:14 +02:00
unknown
435bad16e3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-09-06 07:40:54 +02:00
unknown
91bf9887b8 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  xp64.:C:/work/mysql-5.0-build


libmysql/libmysql.c:
  Auto merged
2007-09-05 16:32:38 -05:00
unknown
464f3833d1 Adding batch files for building with nmake make files
libmysql/libmysql.c:
  remove the duplicate call to DBUG_ENTER
win/build-nmake-x64.bat:
  New BitKeeper file ``win/build-nmake-x64.bat''
win/build-nmake.bat:
  New BitKeeper file ``win/build-nmake.bat''
2007-09-05 16:30:38 -05:00
unknown
7f553f341f Merge omega.weblab:/home/malff/TREE/mysql-5.1-base
into  omega.weblab:/home/malff/TREE/mysql-5.1-rt-merge
2007-09-05 14:52:40 -06:00
unknown
b371ee8a40 Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/50_udf_const


sql/item_func.cc:
  Auto merged
2007-09-05 15:15:48 -04:00
unknown
9a75cc814b Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  damien-katzs-computer.local:/Users/dkatz/mysql50


sql/sql_select.cc:
  Auto merged
2007-09-05 15:08:30 -04:00
unknown
0a28cac0b6 Bug #29804 UDF parameters don't contain correct string length
Previously, UDF *_init functions were passed constant strings with erroneous lengths.
The length came from the containing variable's size, not the length of the value itself.
  
Now the *_init functions get the constant as a null terminated string with the correct
length supplied too.


mysql-test/r/udf.result:
  Test case to check constants passed UDFs.
mysql-test/t/udf.test:
  Test case to check constants passed UDFs.
sql/item_func.cc:
  UDF _init functions are now passed the length of the constants, rather than the max
  length of the var containing the constant.
sql/udf_example.c:
  Added check_const_len functions. The check_const_len_init functions checks that the
  lengths of constants are correctly passed.
sql/udf_example.def:
  Add new example functions to windows dll export list.
2007-09-05 15:06:10 -04:00
unknown
41ae90df8f Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  omega.weblab:/home/malff/TREE/mysql-5.1-cleanup
2007-09-05 12:15:24 -06:00
unknown
712b9b00fb Test events_logs_tests cleanup
Fixed test failure under heavy load, in case truncate table is slow.


mysql-test/r/events_logs_tests.result:
  Fixed test failure under heavy load, in case truncate table is slow.
mysql-test/t/events_logs_tests.test:
  Fixed test failure under heavy load, in case truncate table is slow.
2007-09-05 12:14:43 -06:00
unknown
bfbe3350dd The test case for Bug#29936 doesn't work with the embedded version,
the first query is not running while we are doing wait queries on
a second connection.


mysql-test/r/sp.result:
  Remove test case result for Bug#29936, moving to sp_notembedded.result
mysql-test/r/sp_notembedded.result:
  Test case result for Bug#29936, moved from sp.result
mysql-test/t/sp.test:
  Remove test case for Bug#29936, moving to sp_notembedded.test
mysql-test/t/sp_notembedded.test:
  Test case result for Bug#29936, moved from sp.test
2007-09-05 15:03:02 -03:00
unknown
d02df3b111 change printout to be a warning 2007-09-05 19:39:13 +02:00
unknown
91f14cdb2b moving these tests to suite ndb_team
mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt:
  Rename: mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt -> mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt
mysql-test/suite/ndb_team/t/ndb_autodiscover2.test:
  Rename: mysql-test/suite/ndb/t/ndb_autodiscover2.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover2.test
mysql-test/suite/ndb_team/t/ndb_autodiscover.test:
  Rename: mysql-test/suite/ndb/t/ndb_autodiscover.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover.test
mysql-test/suite/ndb_team/t/ndb_autodiscover3.test:
  Rename: mysql-test/suite/ndb/t/ndb_autodiscover3.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover3.test
mysql-test/suite/ndb_team/r/ndb_autodiscover.result:
  Rename: mysql-test/suite/ndb/r/ndb_autodiscover.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover.result
mysql-test/suite/ndb_team/r/ndb_autodiscover2.result:
  Rename: mysql-test/suite/ndb/r/ndb_autodiscover2.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover2.result
mysql-test/suite/ndb_team/r/ndb_autodiscover3.result:
  Rename: mysql-test/suite/ndb/r/ndb_autodiscover3.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover3.result
mysql-test/suite/ndb_team/t/disabled.def:
  BitKeeper file /home/tomas/mysql-5.1-new-ndb/mysql-test/suite/ndb_team/t/disabled.def
2007-09-05 19:13:36 +02:00
unknown
4a3825c4de tests actually work in statement based 2007-09-05 18:44:47 +02:00
unknown
f215ae978c correct include file 2007-09-05 18:02:46 +02:00
unknown
c36bc160f7 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug27543


storage/ndb/tools/restore/Restore.cpp:
  Remove additional space when merge
2007-09-05 15:37:30 +00:00
unknown
cd2450a163 correct include file 2007-09-05 17:31:26 +02:00
unknown
b6f3279573 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug30024


storage/ndb/tools/restore/Restore.cpp:
  Auto merged
2007-09-05 15:03:11 +00:00
unknown
9462359eba BUG#27543 Backup and restore can compatible with different endians for blob attribute
mysql-test/Makefile.am:
  Add install data for new test case
storage/ndb/tools/restore/Restore.cpp:
  Convert blob(text) length stored in main table
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.2.Data:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.ctl:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.log:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.ctl:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.log:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.1.Data:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.ctl:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.log:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.ctl:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.log:
  test data for endian test
mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result:
  test result for endian test
mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test:
  test case for endian test
2007-09-05 13:01:30 +00:00
unknown
6c34c63d08 getting rid of flush altogether, fix with post_epoch hendeling and/or changes in Rows_log_event
- problem is the database name accessed in Rows_log_event write... get_db() which is a pointer to the share string...
- point to table map instead?
- or copy it?
- or make sure that anything interacting with the share happens _after_ the epoch

Problem with flush is that STMT_END_F may not be included as it shoudld...
2007-09-05 11:43:42 +02:00
unknown
9bfd45098a Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1


libmysql/libmysql.c:
  Auto merged
2007-09-05 09:35:02 +02:00
unknown
739465b60f libmysql/libmysql.c : Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".
libmysql/libmysql.c:
  Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".
2007-09-05 09:30:50 +02:00
unknown
1eed753e8f this flush with flag TRUE causes spurious errors in the binlog... as it will insert a STMT_END_F... and hence an invalid binlog (missing table mappings) 2007-09-05 09:22:58 +02:00
unknown
a3dc9569e9 Merge gleb.loc:/home/uchum/work/bk/5.1-opt-29938
into  gleb.loc:/home/uchum/work/bk/5.1-opt


client/mysqldump.c:
  Auto merged
2007-09-05 11:43:40 +05:00
unknown
6a71b067b0 Fixed bug #29938.
mysqldump --skip-events --all-databases dumped data of the mysqld.event table,
and during the restoration from this dump events were created in spite
of the --skip-events option.

The mysqldump client has been modified to ignore mysql.event table data
in case of --skip-events options.


client/mysqldump.c:
  Fixed bug #29938.
  The dump_table function has been modified to skip dumping of
  the mysql.event table data in case of the --skip-event mysqldump
  client option.
mysql-test/t/mysqldump.test:
  Updated test case for bug #29938.
mysql-test/r/mysqldump.result:
  Updated test case for bug #29938.
2007-09-05 11:35:29 +05:00
unknown
700d8b1f09 Discovered a bug while working with backup. Since it is possible to execute a statement in a pre/post statment clause that can return a result, we need to test for that and free it.
client/mysqlslap.c:
  Cleanup resuls if rows are returned.
2007-09-04 20:03:12 -07:00
unknown
ddf8272b75 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
2007-09-04 16:50:09 -06:00
unknown
5c836d24f6 Fixed whitespace 2007-09-04 16:40:27 -06:00
unknown
3a94137ce0 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
2007-09-04 14:38:26 -06:00
unknown
5231a4d90b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-09-04 22:25:23 +02:00
unknown
c458f7f6a3 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
2007-09-04 12:25:54 -06:00
unknown
338bc58ea7 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-09-04 19:56:08 +02:00
unknown
9d109fdef2 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_record.cc:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
2007-09-04 19:49:42 +02:00
unknown
ea10f62341 Merge trift2.:/MySQL/M41/push-4.1
into  trift2.:/MySQL/M50/push-5.0
2007-09-04 19:43:44 +02:00
unknown
689aaff906 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-09-04 19:41:33 +02:00
unknown
5c02bcbad9 Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-09-04 19:37:45 +02:00
unknown
6bfae914a2 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-09-04 17:46:01 +02:00
unknown
6f74c4ed29 Merge adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


sql/sql_cache.cc:
  Auto merged
2007-09-04 17:43:29 +02:00
unknown
03d93ca6fc Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-04 11:39:34 +02:00
unknown
7146906323 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


configure.in:
  Auto merged
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
BitKeeper/deleted/.del-net_serv.cc~120fb81d7e670308:
  Auto merged
BitKeeper/deleted/.del-pack.c~4754cd15e3058c75:
  Auto merged
BitKeeper/deleted/.del-password.c~9d4b6a4c57887ac7:
  Auto merged
BitKeeper/deleted/.del-sql_state.c~3b39d30b649690f3:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
2007-09-04 11:07:07 +02:00
unknown
a7ca2a3978 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-09-04 11:06:02 +02:00
unknown
ce845ef740 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/include/have_bug25714.inc:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
configure.in:
  null-merge
BitKeeper/deleted/.del-net_serv.cc:
  Auto merged
BitKeeper/deleted/.del-pack.c:
  Auto merged
BitKeeper/deleted/.del-password.c:
  Auto merged
BitKeeper/deleted/.del-sql_state.c:
  Auto merged
2007-09-04 10:54:32 +02:00
unknown
0ec2e69d7f Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work


libmysql/libmysql.c:
  Auto merged
2007-09-04 10:49:54 +02:00