Commit graph

14035 commits

Author SHA1 Message Date
unknown
6ad7b37339 WL #1034 (Internal CRON) post-push fix
fix problem that gcc4 does not like at all


sql/event.h:
  fix problem that gcc4 does not like at all
2006-01-12 19:51:13 +01:00
unknown
eb2012034c WL #1034 (Internal CRON) post-push update
- fix compile failure on QNX and FreeBSD


sql/event_executor.cc:
  time_t and my_time_t seem have the same length so cast
  in tztime.cc it's already done this way.
  Precautionary check at runtime about the sizes of my_time_t and time_t
sql/event_timed.cc:
  do time_t* cast to satisfy compilers on various platforms
  (QNX, FreeBSD)
2006-01-12 16:51:45 +01:00
unknown
69f4b6a92b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs3
2006-01-12 11:48:48 +04:00
unknown
4ab53435d6 sql_table.cc:
Typo fix.
  Thanks Serg for noticing this.


sql/sql_table.cc:
  Typo fix.
  Thanks Serg for noticing this.
2006-01-12 11:41:57 +04:00
unknown
41315876ee Fixed typo.
Really dumb typo....


sql/ha_archive.h:
  Fix typo
2006-01-11 22:59:08 -08:00
unknown
a549befb6d Added bitfield support and a test for it.
Archive uses native row format, so honestly this is just the change in a flag. 


sql/ha_archive.h:
  Added bit field support (and dropped the ha_not_exact_count since we always have this).
mysql-test/r/archive_bitfield.result:
  New BitKeeper file ``mysql-test/r/archive_bitfield.result''
mysql-test/t/archive_bitfield.test:
  New BitKeeper file ``mysql-test/t/archive_bitfield.test''
2006-01-11 21:16:51 -08:00
unknown
09d2e055bc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 12:06:30 -08:00
unknown
9dc0942ac1 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 19:50:59 +01:00
unknown
0966a18915 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-11 19:50:58 +01:00
unknown
45a4daa43f bug: replication of table spaces to work
bug: check if storage engine is enabled to avoif code dump


BitKeeper/etc/ignore:
  Added storage/ndb/test/ndbapi/DbAsyncGenerator storage/ndb/test/ndbapi/DbCreate storage/ndb/test/ndbapi/ndbapi_slow_select storage/ndb/test/ndbapi/testBitfield storage/ndb/test/ndbapi/testLcp storage/ndb/test/ndbapi/testPartitioning storage/ndb/test/ndbapi/testReadPerf storage/ndb/test/ndbapi/test_event_merge storage/ndb/test/tools/listen_event to the ignore list
2006-01-11 19:49:38 +01:00
unknown
af6d402627 WL #1034
- add a bit more debug messages
- disable events.test for now due to a bug


mysql-test/r/events.result:
  fix result
mysql-test/t/disabled.def:
  make it disabled
mysql-test/t/events.test:
  disable show processlist
sql/event_executor.cc:
  a bit more debug messages
2006-01-11 19:31:21 +01:00
unknown
21d71ab514 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 09:37:48 -08:00
unknown
2fc956fae9 WL #1034 (Internal CRON) pre-push updates
- various fixes of test cases
(hopefully the last pre-push update before the push)


mysql-test/include/system_db_struct.inc:
  extend test case to include testing for event system table
mysql-test/r/events.result:
  results of events test
mysql-test/r/system_mysql_db.result:
  more testing - add structure of event system table
mysql-test/t/events.test:
  test case for events (internal CRON)
mysql-test/t/system_mysql_db_fix.test:
  drop event table and leave the test database empty
scripts/mysql_create_system_tables.sh:
  add missing create table statement
scripts/mysql_fix_privilege_tables.sql:
  don't specify the database. this fixes a failing test case which creates the
  tables not on mysql but on a test database and then tests again mysql.
sql/event_executor.cc:
  if asked to stop -> stop.
2006-01-11 18:09:05 +01:00
unknown
8d1ea9e259 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 16:06:05 +01:00
unknown
bfa1100074 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/bkroot/mysql-5.1-new
2006-01-11 13:53:35 +01:00
unknown
a66eafd671 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works


sql/sql_show.cc:
  Auto merged
2006-01-11 12:51:17 +01:00
unknown
b8ce8ad1d5 WL #1034 (Internal CRON) pre-push fixes
after another merge fixes.


mysql-test/r/information_schema.result:
  WL #1034 (Internal CRON)
  fix result
mysql-test/r/mysqlcheck.result:
  WL #1034 (Internal CRON)
  fix result
mysql-test/r/sp.result:
  WL #1034 (Internal CRON)
  fix result
sql/event.cc:
  after fixes for WL1012 fix these to be able to compile
sql/event_timed.cc:
  after fixes for WL1012 fix these to be able to compile
sql/share/errmsg.txt:
  readd error messages removed during manual update
sql/sql_yacc.yy:
  fix sql_yacc.yy for WL#1034 (Internal CRON) after the manual
  merge. The merge wasn't good :(
2006-01-11 12:49:56 +01:00
unknown
2769f0dce6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-01-11 15:05:40 +04:00
unknown
5df64b263c Additional fix for wl#2506
mysql-test/extra/binlog_tests/ctype_cp932.test:
    fixed test case
mysql-test/r/binlog_stm_ctype_cp932.result:
    fixed test result
mysql-test/t/ctype_ucs.test:
    fixed test case
sql/sql_show.cc:
   Compilation with disabled partitioning is fixed
2006-01-11 15:04:18 +04:00
unknown
0d732a1470 manual merge
sql/Makefile.am:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-01-11 12:01:36 +01:00
unknown
a64008e13c Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b16095-mysql-5.1-new
2006-01-11 11:50:09 +01:00
unknown
641ce5e97e wl2723 - ndb opt. nr
mysql-test/t/rpl_multi_engine.test:
  merge fix
libmysqld/sql_tablespace.cc:
  New BitKeeper file ``libmysqld/sql_tablespace.cc''
mysql-test/r/ndb_basic_disk.result:
  New BitKeeper file ``mysql-test/r/ndb_basic_disk.result''
mysql-test/t/ndb_basic_disk.test:
  New BitKeeper file ``mysql-test/t/ndb_basic_disk.test''
sql/sql_tablespace.cc:
  New BitKeeper file ``sql/sql_tablespace.cc''
storage/ndb/src/kernel/blocks/OptNR.txt:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/OptNR.txt''
storage/ndb/src/kernel/vm/mem.txt:
  New BitKeeper file ``storage/ndb/src/kernel/vm/mem.txt''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp''
storage/ndb/tools/ndb_error_reporter:
  New BitKeeper file ``storage/ndb/tools/ndb_error_reporter''
2006-01-11 11:35:25 +01:00
unknown
4cacc3675c Bug#16095 (INSERT DELAYED crashes mysqld server):
Checking that binlog is open before calling binlog_query().


mysql-test/r/rpl_row_basic_11bugs.result:
  Result change caused by test change.
mysql-test/t/rpl_row_basic_11bugs.test:
  Ignoring format event since it contain the version number.
sql/sql_insert.cc:
  Debriding code.
  Checking that binlog is open before calling binlog_query().
2006-01-11 09:16:24 +01:00
unknown
a9d9054a10 Added support for CREATE TABLE AUTO_INCREMENT and added more tests. Also non-unique index scans of autoincrement not function.
mysql-test/r/archive.result:
  New Result file.
mysql-test/t/archive.test:
  New tests. Modifies old style 0 to NULL.
sql/ha_archive.cc:
  Added support for scanning non unique indexes. Added support for the AUTO_INCREMENT bit for CREATE TABLE
sql/ha_archive.h:
  Added variables for continueing scans of index_next
2006-01-10 22:54:34 -08:00
unknown
923b97736f WL #1034 (Internal CRON) pre-push update
fix errmsg.txt


sql/share/errmsg.txt:
  fix errmsg.txt so being able to build it
2006-01-10 21:47:12 +01:00
unknown
bb0b7f5dda WL #1034 (Internal CRON)
merge before push


BUILD/SETUP.sh:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
libmysqld/Makefile.am:
  manual merge
mysql-test/r/information_schema.result:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_lex.h:
  manual merge
sql/sql_yacc.yy:
  manual merge
2006-01-10 21:02:19 +01:00
unknown
1ef97f1f3b WL #1034 (Internal CRON) pre-push updates
- fixed test results
- fixed bug caught by information_schema.test . Bison temporal
  variables are very nice but extremely error-prone (Count one more
  time just to be sure).


mysql-test/r/connect.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/events.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/grant.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/information_schema.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/lowercase_table_grant.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/ps.result:
  fix result for WL#1034 (internal CRON)
mysql-test/r/system_mysql_db.result:
  fix result for WL#1034 (internal CRON)
mysql-test/t/events.test:
  fix result for WL#1034 (internal CRON)
sql/sql_yacc.yy:
  - fix bug introduced by me when making usage of temporal
    bison variables. COUNT 7 times then write!
2006-01-10 19:16:58 +01:00
unknown
31d3c88cae WL#2506: Information Schema tables for PARTITIONing
added I_S 'PARTITIONS' table
2006-01-10 19:44:04 +04:00
unknown
f133a92312 WL 1034 update
(pre-push cleanups removing debugging code)


sql/event.cc:
  - comment
  - fix 80 cols
  - fix a crash when dropping a running event (after it has finished
    its work because the memory got freed in remove_from_cache but the event
    was still running)
sql/event.h:
  - add new method
sql/event_executor.cc:
  - remove printf-s
  - fix 80cols
  - fix message
2006-01-10 11:31:45 +01:00
unknown
711ee7486f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-01-10 02:19:01 -08:00
unknown
a670199a4c Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/bug15598/my51-bug15598
2006-01-10 09:20:30 +01:00
unknown
1e1f3743c6 Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-01-10 00:14:39 -08:00
unknown
874fea6d28 Removing unneeded include.
sql/ha_archive.h:
  Removed unneeded include.
2006-01-09 21:04:58 -08:00
unknown
df046728e8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-09 18:53:02 -08:00
unknown
c9f5a5cc85 Corrections from code review for auto_increment. Added test cases.
mysql-test/r/archive.result:
  New result file.
mysql-test/t/archive.test:
  Added new tests for indexes. Also accidently updated it so that all "FROM" are now capitalized :)
sql/ha_archive.cc:
  Changed comparision function to compare memory locations. 
  
  Modified function for storing the auto_increment. 
  Removed useless DBUG_PRINT
2006-01-09 18:41:37 -08:00
unknown
e8595bb5bd errmsg.txt:
Fix word.
  (no test results needed fixing)


sql/share/errmsg.txt:
  Fix word.
  (no test results needed fixing)
2006-01-09 20:13:27 -06:00
unknown
08da99aa94 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-rbr_cleanups


sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  accepted Mat's changes to the template defs
2006-01-09 17:35:25 -06:00
unknown
60d827b678 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-09 13:02:00 -08:00
unknown
9ade5f6722 Merge neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
into  neptunus.(none):/home/msvensson/mysql/bug15598/my51-bug15598


mysql-test/r/grant.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2006-01-09 18:04:53 +01:00
unknown
4ae3456ba4 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598


sql/sql_acl.cc:
  Auto merged
2006-01-09 17:18:49 +01:00
unknown
cff44050dc Changes to support HP-UX.
sql/log.cc:
  Preprocessor symbol NO_FLAGS used by system on HP-UX.
sql/log_event.h:
  Preprocessor symbol NO_FLAGS used by system on HP-UX.
2006-01-09 16:37:24 +01:00
unknown
73e868f43c Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/mkindahl/bk/fix-mysql-5.1-new
2006-01-09 16:02:14 +01:00
unknown
00ba4659ee Changes to support aCC on HP-UX.
sql/log_event.h:
  Adding enumeration constants since aCC (HP-UX) does not like empty enumerations.
sql/sql_class.cc:
  Adding template parameter as argument to member template function to support aCC on HP-UX.
sql/sql_class.h:
  Adding template parameter as argument to member template function to support aCC on HP-UX.
2006-01-09 15:59:39 +01:00
unknown
6d8f89b8c2 This changeset adds support for autoincrements to archive. It allows it to have them with both unique and non-unique indexes.
Test cases will come in the next push (just doing this one so I can get a couple of reviews in). This is not the final patch. 


sql/field.h:
  Added val_int() method similar to the one like val_str() that will allow you to pop in another pointer and do a test.
sql/ha_archive.cc:
  Adds auto_increment support to archive. Cleans up a number of other small items.
sql/ha_archive.h:
  More additions for support of autoincrements
2006-01-09 02:35:40 -08:00
unknown
6dd6f60749 Fix "jump to label crosses initialization" compile error. 2006-01-09 11:23:15 +01:00
unknown
998b7dca54 Merge neptunus.(none):/home/msvensson/mysql/bug15598/my41-bug15598
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598


mysql-test/t/grant.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/r/grant.result:
  SCCS merged
2006-01-09 11:16:29 +01:00
unknown
dd918a71d4 Fix template problem with Sun compiler by using anonymous namespace instead
of static for referenged function.
2006-01-09 11:08:23 +01:00
unknown
16257e8b35 Bug #15598 Server crashes in specific case during setting new password
- When acl_user->host.hostname is NULL compare it as ""


mysql-test/r/grant.result:
  Test user with host ''
mysql-test/t/grant.test:
  Test user with host ''
sql/sql_acl.cc:
  If acl_user->host.hostname is NULL compare it as ""
2006-01-09 10:31:07 +01:00
unknown
9bdabbf6d8 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/mkindahl/bk/b15923-mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sql_delete.cc:
  Auto merged
2006-01-09 09:47:23 +01:00
unknown
1205890ce3 Bug#15923 (Test ps_7ndb cause master crash):
Always log statements "DELETE FROM x" statement-based. 


sql/sql_delete.cc:
  Logging deletion of all rows using statement-based logging.
2006-01-09 09:37:21 +01:00