Commit graph

31319 commits

Author SHA1 Message Date
unknown
6afe1bc76e ndb - sockaddr alignment fix, found on sunfire100a, can affect any non-x86
storage/ndb/src/common/transporter/Transporter.cpp:
  use sockaddr_in in declarations to guarantee sin_addr alignment
storage/ndb/src/mgmsrv/Services.cpp:
  use sockaddr_in in declarations to guarantee sin_addr alignment
2006-02-25 17:25:22 +01:00
unknown
54e0c92d59 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-02-25 17:48:09 +02:00
unknown
f5f01b15e7 Fixed compiler warnings from gcc 4.0.2:
- Added empty constructors and virtual destructors to many classes and structs
- Removed some usage of the offsetof() macro to instead use C++ class pointers


configure.in:
  Added comment
ndb/include/ndbapi/NdbDictionary.hpp:
  Fixed compiler warnings from gcc 4.0.2
sql/field.cc:
  Fixed compiler warnings from gcc 4.0.2
sql/handler.h:
  Fixed compiler warnings from gcc 4.0.2
sql/item.h:
  Fixed compiler warnings from gcc 4.0.2
sql/item_cmpfunc.h:
  Fixed compiler warnings from gcc 4.0.2
sql/log_event.h:
  Fixed compiler warnings from gcc 4.0.2
sql/mysql_priv.h:
  Fixed compiler warnings from gcc 4.0.2
  For find_table_in_list I fixed it to use proper C++ class pointers instead of C style pointers
sql/opt_range.cc:
  Fixed compiler warnings from gcc 4.0.2
sql/parse_file.h:
  Fixed compiler warnings from gcc 4.0.2
sql/sp_rcontext.h:
  Fixed compiler warnings from gcc 4.0.2
sql/spatial.h:
  Fixed compiler warnings from gcc 4.0.2
sql/sql_base.cc:
  Fixed compiler warnings from gcc 4.0.2
sql/sql_cache.h:
  Fixed compiler warnings from gcc 4.0.2
sql/sql_class.h:
  Fixed compiler warnings from gcc 4.0.2
sql/sql_parse.cc:
  Fixed compiler warnings from gcc 4.0.2
  (Not pretty, but seams to work...)
sql/sql_select.h:
  Fixed compiler warnings from gcc 4.0.2
sql/sql_update.cc:
  Fixed compiler warnings from gcc 4.0.2
sql/table.h:
  Fixed compiler warnings from gcc 4.0.2
sql/tztime.cc:
  Fixed compiler warnings from gcc 4.0.2
sql/tztime.h:
  Fixed compiler warnings from gcc 4.0.2
2006-02-25 17:46:30 +02:00
unknown
635d5b734a Add back free that I accidently removed in last patch 2006-02-25 13:58:00 +02:00
unknown
6436f923df Fixed typo
sql/sql_db.cc:
  Move LINT_INIT() to correct place
2006-02-25 13:49:43 +02:00
unknown
8ec3fa3b8c Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-02-25 13:26:05 +02:00
unknown
3093b5fea7 Fixed new introduced bug in binlog.test with --ps-protocol
mysql-test/t/binlog.test:
  Fixed --ps-protocol (Side effect from last patch)
sql/sql_db.cc:
  Removed compiler warning
  Fixed memory loss on slave
tests/mysql_client_test.c:
  Removed compiler warnings
2006-02-25 13:24:18 +02:00
unknown
8f4cec206b Merge zim.(none):/home/brian/mysql/mysql-5.0
into  zim.(none):/home/brian/mysql/dep-5.1


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
2006-02-24 23:31:57 -08:00
unknown
e737b00134 Someone modified the output to explain but did not run all tests before pushing, otherwise they would have realized that they broke this test.
mysql-test/r/partition_pruning.result:
  Updated results
2006-02-24 15:51:01 -08:00
unknown
d958f19a1b Fix error messages. Someone pushed a change to an error message but did not update the tests.
AKA someone pushed without testing.


mysql-test/r/partition_02myisam.result:
  Fixed error messages
2006-02-24 14:16:06 -08:00
unknown
cdeacb3954 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-02-24 13:41:38 -08:00
unknown
7375fe240c Fix a typo in dbug printout
sql/opt_range.cc:
  Fix a typo in dbug printout: print "min_val < partitioning_field < max_val",
  not "max_val < partitioning_field < max_val"
2006-02-25 00:41:37 +03:00
unknown
868cc7fd44 This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.
BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6:
  Delete: include/raid.h
BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1:
  Delete: mysys/raid.cc
BitKeeper/deleted/.del-raid2.c~fe7aea5fb4b9748c:
  Delete: mysys/raid2.c
include/Makefile.am:
  Removing raid
include/my_sys.h:
  Removing Raid
include/myisam.h:
  Removing raid
mysql-test/r/case.result:
  Cleaned up incomming tables
mysql-test/r/mysqlcheck.result:
  new results
mysql-test/t/case.test:
  Cleaned up test
mysql-test/t/mysqlcheck.test:
  Cleaned up two tests.
mysys/Makefile.am:
  Removed raid
mysys/my_static.c:
  Removed raid
storage/myisam/mi_check.c:
  Removed raid
storage/myisam/mi_info.c:
  Removed raid bits.
2006-02-24 13:20:51 -08:00
unknown
f8386dfa48 Fix for bug #13525 "Rename table does not keep info of triggers".
Let us transfer triggers associated with table when we rename it (but only if
we are not changing database to which table belongs, in the latter case we will
emit error).


mysql-test/r/trigger.result:
  Added test for bug #13525 "Rename table does not keep info of triggers".
mysql-test/t/trigger.test:
  Added test for bug #13525 "Rename table does not keep info of triggers".
sql/sql_rename.cc:
  rename_tables():
    Now after renaming table's .FRM file and updating handler data we call
    Table_triggers_list::change_table_name() which is reponsible for
    updating .TRG and .TRN files.
sql/sql_table.cc:
  mysql_alter_table():
    Now in case when ALTER should rename table we call
    Table_triggers_list::change_table_name() which is responsible
    for updating .TRG and .TRN files after renaming table.
sql/sql_trigger.cc:
  Added Table_triggers_list::change_table_name() method and
  change_table_name_in_triggers()/trignames() methods responsible for updating
  .TRG and .TRN files for table during its renaming.
  
  Two small cleanups - removed versioning for .TRG files (since it was not working
  before anyway) and emphasized that type of lock specified in tables list is
  unimportant for DROP TABLE (since this statement uses name-locking).
sql/sql_trigger.h:
  Table_triggers_list:
    Added on_table_names_list member to store pointers and lenghts of
    "ON table_name" parts in triggers' definitions to be able easily
    change them during RENAME TABLE.
    Added change_table_name() method and change_table_name_in_trignames/triggers()
    helper methods responsible for updating .TRG and .TRN files.
sql/sql_yacc.yy:
  trigger_tail:
    To be able properly update triggers' definitions with new table names
    when renaming tables we need to know where in CREATE TRIGGER statement
    "ON db_name.table_name" part resides.
    Small cleanup - let us emphasize that for CREATE TRIGGER statement 
    lock type which is specified in table list is unimportant since
    name-locking is used.
2006-02-24 23:50:36 +03:00
unknown
cfbb40bbc0 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/bk/mysql-5.1-release-bug13418-lars


mysql-test/t/disabled.def:
  Auto merged
2006-02-24 20:27:51 +01:00
unknown
dab88b2986 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-02-24 18:36:09 +02:00
unknown
0afb6ff660 Fixes to embedded server to be able to run tests with it
(Needed for "list of pushes" web page and autopush)


include/mysql.h:
  Fix to embedded server to be able to run tests on it
libmysql/libmysql.c:
  Fix to embedded server to be able to run tests on it
libmysqld/emb_qcache.cc:
  Fix to embedded server to be able to run tests on it
libmysqld/embedded_priv.h:
  Fix to embedded server to be able to run tests on it
libmysqld/lib_sql.cc:
  Fix to embedded server to be able to run tests on it
libmysqld/libmysqld.c:
  Fix to embedded server to be able to run tests on it
mysql-test/mysql-test-run.sh:
  Fix to embedded server to be able to run tests on it
mysql-test/r/binlog.result:
  Updated test for embedded server
mysql-test/r/ctype_cp932.result:
  Updated test for embedded server
mysql-test/r/innodb.result:
  Updated test for embedded server
mysql-test/r/mysqltest.result:
  Updated test for embedded server
mysql-test/r/query_cache.result:
  Updated test for embedded server
mysql-test/r/query_cache_notembedded.result:
  Updated test for embedded server
mysql-test/r/sp-error.result:
  Updated test for embedded server
mysql-test/r/sp.result:
  Updated test for embedded server
mysql-test/r/subselect.result:
  Updated test for embedded server
mysql-test/r/view.result:
  Updated test for embedded server
mysql-test/r/view_grant.result:
  Updated test for embedded server
mysql-test/t/backup.test:
  Updated test for embedded server
mysql-test/t/binlog.test:
  Updated test for embedded server
mysql-test/t/blackhole.test:
  Updated test for embedded server
mysql-test/t/compress.test:
  Updated test for embedded server
mysql-test/t/ctype_cp932.test:
  Updated test for embedded server
mysql-test/t/delayed.test:
  Updated test for embedded server
mysql-test/t/handler.test:
  Updated test for embedded server
mysql-test/t/innodb.test:
  Updated test for embedded server
mysql-test/t/mysql.test:
  Updated test for embedded server
mysql-test/t/mysql_client_test.test:
  Updated test for embedded server
mysql-test/t/mysqltest.test:
  Updated test for embedded server
mysql-test/t/query_cache.test:
  Updated test for embedded server
mysql-test/t/query_cache_notembedded.test:
  Updated test for embedded server
mysql-test/t/read_only.test:
  Updated test for embedded server
mysql-test/t/skip_grants.test:
  Updated test for embedded server
mysql-test/t/sp-destruct.test:
  Updated test for embedded server
mysql-test/t/sp-error.test:
  Updated test for embedded server
mysql-test/t/sp-threads.test:
  Updated test for embedded server
mysql-test/t/sp.test:
  Updated test for embedded server
mysql-test/t/subselect.test:
  Updated test for embedded server
mysql-test/t/temp_table.test:
  Updated test for embedded server
mysql-test/t/view.test:
  Updated test for embedded server
mysql-test/t/view_grant.test:
  Updated test for embedded server
mysql-test/t/wait_timeout.test:
  Updated test for embedded server
mysys/mf_dirname.c:
  Review fix: Don't access data outside of array
mysys/my_bitmap.c:
  Remove compiler warnings
scripts/mysql_fix_privilege_tables.sql:
  Add flush privileges to .sql script so that one doesn't have to reboot mysqld when one runs the mysql_fix_privilege_script
sql-common/client.c:
  Updated test for embedded server
sql/item.cc:
  Remove DBUG_PRINT statement that can cause crashes when running with --debug
sql/mysqld.cc:
  Fix to embedded server to be able to run tests on it
sql/protocol.cc:
  Fix to embedded server to be able to run tests on it
  (Trivial reconstruction of code)
sql/protocol.h:
  Fix to embedded server to be able to run tests on it
sql/sql_base.cc:
  Better comment
sql/sql_class.cc:
  Fix to embedded server to be able to run tests on it
sql/sql_class.h:
  Fix to embedded server to be able to run tests on it
sql/sql_cursor.cc:
  Fix to embedded server to be able to run tests on it
sql/sql_parse.cc:
  Fix to embedded server to be able to run tests on it
  Don't crash for disabled commands when using embedded server
sql/sql_prepare.cc:
  Fix to embedded server to be able to run tests on it
mysql-test/r/ctype_cp932_notembedded.result:
  New BitKeeper file ``mysql-test/r/ctype_cp932_notembedded.result''
mysql-test/r/innodb_notembedded.result:
  New BitKeeper file ``mysql-test/r/innodb_notembedded.result''
mysql-test/r/sp.result.orig:
  New BitKeeper file ``mysql-test/r/sp.result.orig''
mysql-test/r/sp_notembedded.result:
  New BitKeeper file ``mysql-test/r/sp_notembedded.result''
mysql-test/r/subselect_notembedded.result:
  New BitKeeper file ``mysql-test/r/subselect_notembedded.result''
mysql-test/t/ctype_cp932_notembedded.test:
  New BitKeeper file ``mysql-test/t/ctype_cp932_notembedded.test''
mysql-test/t/innodb_notembedded.test:
  New BitKeeper file ``mysql-test/t/innodb_notembedded.test''
mysql-test/t/sp.test.orig:
  New BitKeeper file ``mysql-test/t/sp.test.orig''
mysql-test/t/sp_notembedded.test:
  New BitKeeper file ``mysql-test/t/sp_notembedded.test''
mysql-test/t/subselect_notembedded.test:
  New BitKeeper file ``mysql-test/t/subselect_notembedded.test''
2006-02-24 18:34:15 +02:00
unknown
a9dab911a4 BUG# 17430 Partitoins: crash on SELECT * FROM t1 WHERE f_int1 IS NULL
BUG# 17432: Partitions: wrong result, SELECT ... WHERE <column> is null


mysql-test/r/partition.result:
  result block for tests
mysql-test/t/partition.test:
  test cases for bug #17432 and 17430
sql/sql_partition.cc:
  improve null handling by returning LONGLONG_MIN for values that are NULL
2006-02-24 10:10:41 -06:00
unknown
3a78156ee6 Bug #17443 mysqldump test failure
client/mysqlimport.c:
  Remove disabled --use-threads option
mysql-test/r/mysqldump.result:
  Update result
mysql-test/t/disabled.def:
  Remove disable of mysqldump
mysql-test/t/mysqldump.test:
  Remove the disable_parsing on tests for --use-threads to mysqlimport
2006-02-24 17:10:40 +01:00
unknown
50397f3f4b Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/users/lthalmann/bk/mysql-5.1-release-bug13418
2006-02-24 16:22:06 +01:00
unknown
b5246481b5 Add CMake targets for missing stuff for release build. 2006-02-24 15:49:57 +01:00
unknown
d6aea04c5b Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-02-24 15:47:07 +01:00
unknown
dededdec0a BUG#13418 (V2): Bit columns should replicate correctly when using RBR
mysql-test/r/rpl_bit_npk.result:
  Updated results
mysql-test/t/disabled.def:
  rpl_bit_npk now works
sql/field.h:
  Field_bit::cmp_binary_offset wrongly used base class method that does not work for Field_bit
  This was discussed with Monty and should be pushed into 5.0 too
sql/log_event.cc:
  Added checks for null bits
  Swapped use of m_after_image (was m_search_record) and table->record[1] to use record[i] 
  in the same way as other MySQL code (i.e. use record[1] for scan data).
  Removed use of cmp_binary in record_compare (it is currently wrong to use that 
  without copying the null bits to the compare data record)
sql/log_event.h:
  Name change to indicate new semantics
2006-02-24 15:38:20 +01:00
unknown
db8392d67d last second additions for bug#16411
mysql-test/r/events_microsec.result:
  update results
mysql-test/t/events_microsec.test:
  use the newly introduced I_S.PROCESSLIST to check whether the scheduler is running.
2006-02-24 15:28:20 +01:00
unknown
b1793d9c13 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16411


sql/sql_show.cc:
  Auto merged
2006-02-24 14:14:51 +01:00
unknown
a7d13b9dbd add this file to revision control. there was not new line at the end of the file
fix for bug#16411
2006-02-24 14:10:24 +01:00
unknown
d587a26bfa fix for bug #16411 (microseconds are allowed)
last fixes


sql/event_executor.cc:
  fix message
2006-02-24 14:08:34 +01:00
unknown
4f2d6f1158 fix for bug #16411 (Microseconds are allowed for events)
sql/event_timed.cc:
  fix problem during merge
2006-02-24 14:02:26 +01:00
unknown
6716fc050e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/17530-bug-5.0-mysql
2006-02-24 15:57:36 +03:00
unknown
a1023b0582 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/local/mysql/mysql-5.1-new


mysql-test/t/mysqldump.test:
  Auto merged
2006-02-24 13:56:42 +01:00
unknown
f1a8a34c6c Fix mysqldump.test to work with non-standard --vardir.
(Backported from mysql-5.1-new)


mysql-test/t/mysqldump.test:
  Fix mysqldump.test to work with non-standard --vardir.
2006-02-24 13:51:04 +01:00
unknown
0d1c357772 fix test result
fix for bug #16412 (post-merge fix)


mysql-test/r/sp.result:
  fix test result
2006-02-24 13:34:28 +01:00
unknown
eb7f54a9f3 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/17530-bug-5.0-mysql
2006-02-24 14:29:41 +03:00
unknown
d7d068ea22 merge
mysql-test/r/events.result:
  Auto merged
sql/event.cc:
  Auto merged
sql/event.h:
  Auto merged
sql/event_executor.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/event_timed.cc:
  manual merge
2006-02-24 12:03:32 +01:00
unknown
8fd0e70ce2 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16412


sql/sql_show.cc:
  Auto merged
2006-02-24 11:56:16 +01:00
unknown
5f214cf216 Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information)
WL#1034 (Internal CRON)


mysql-test/r/grant.result:
  fix result file
sql/sql_show.cc:
  Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information)
2006-02-24 11:52:03 +01:00
unknown
4bef622585 Fix mysqldump.test to work with non-standard --vardir. 2006-02-24 10:15:39 +01:00
unknown
760de195eb Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-release
2006-02-23 23:21:53 -05:00
unknown
c6ee60933d BUG#17521 alter database crashes slave
Problem was a null pointer
Fixed by passing correct database name to slave filtering mechanism
Added test.


sql/sql_parse.cc:
  Fix slave crash when issuing 'ALTER DATABASE' with specifying db name
  Don't pass null pointer to db_ok_with_wild_table()
2006-02-23 23:20:29 -05:00
unknown
3754c4eb1f Makefile.am:
Conditionally link with libmysqlclient.la or libmysqlclient_r.la
configure.in:
  Corrected help text for --with-debug option
  Changed default to be with thread safe client
  Added THREAD_SAFE_CLIENT to be used in 'if' in make files


configure.in:
  Corrected help text for --with-debug option
  Changed default to be with thread safe client
  Added THREAD_SAFE_CLIENT to be used in 'if' in make files
client/Makefile.am:
  Conditionally link with libmysqlclient.la or libmysqlclient_r.la
2006-02-24 01:24:41 +01:00
unknown
9805bd76f6 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release
2006-02-24 00:33:26 +01:00
unknown
bb26549bc0 fix for bug #16400
scripts/mysql_fix_privilege_tables.sh:
  fix the message as per #16399
sql/sql_acl.cc:
  fix the priv per review comment by Serg
2006-02-24 00:29:50 +01:00
unknown
b9697b2056 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/bk/fix-mysql-5.1-release
2006-02-23 22:21:07 +01:00
unknown
e2994b2857 Bug#17678 (RBR format change: moving from VLE to net encoding):
Switching to use net_*_length() instead of VLE functions.


sql/log_event.cc:
  Switching to use net_*_length() instead of VLE functions.
2006-02-23 22:19:47 +01:00
unknown
f2fd3c2781 After-merge fixes (Bug#13134) 2006-02-24 00:12:04 +03:00
unknown
e0b4e228ff Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime
2006-02-24 00:09:47 +03:00
unknown
9519987cf0 Merge mysql.com:/opt/local/work/mysql-4.1-13134
into  mysql.com:/opt/local/work/mysql-5.0-runtime


mysql-test/t/heap.test:
  Auto merged
mysql-test/r/heap.result:
  Manual merge (use local)
mysql-test/r/ps.result:
  Manual merge (use local)
mysql-test/t/ps.test:
  Manual merge.
sql/field.cc:
  Manual merge.
sql/field.h:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
2006-02-24 00:00:15 +03:00
unknown
ea9ea952be Remove 'delayed' to make the test deterministic (already
fixed in 5.0).
A post-review fix (Bug#13134)


mysql-test/r/heap.result:
  Remove 'delayed' to make the test deterministic.
mysql-test/r/ps.result:
  Remove an unneeded drop table (test case for Bug#13134)
mysql-test/t/heap.test:
  Remove 'delayed' to make the test deterministic.
mysql-test/t/ps.test:
  A post-review fix (Bug#13134)
2006-02-23 23:41:15 +03:00
unknown
e16e4ff8f0 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged
2006-02-23 13:56:00 -06:00
unknown
ef1316fadd mysqltest.c:
Rearrange out of order options in option struct.


client/mysqltest.c:
  Rearrange out of order options in option struct.
2006-02-23 13:54:55 -06:00