Commit graph

20178 commits

Author SHA1 Message Date
unknown
f6c9db08b6 WL# 2094 Federated Storage Handler
Patch #2, all coding style changes per Kostja's review 
(as requested to keep style changes separate from functionality changes),
as well as changes to the test suit to no longer use hard-coded port 
values in foreign table creation statement


mysql-test/r/federated.result:
  Now using SLAVE_PORT as opposed to hard-coded port value
mysql-test/t/federated.test:
  - changed test to use SLAVE_MYPORT
  - made all standard SQL uppercase
  - made test 80 cols, except blob inserts of text
sql/ha_federated.cc:
  - made sure all comments and style changes were according to Kostja's 
  review 
  - combined parse_url error handling into a 'error:' block, took out 
  triple exclamation points.
  - clarified commented documentation
  - got rid of all trailing spaces
2005-02-23 00:38:29 -08:00
unknown
aec302676a WL #2094 Federated Storage Handler
This is the first changeset of suggested changes recommended in Kostja's 
review of my patch, 1.1846, which includes only functionality changes. 
Style changes/Documentation patch to follow.


include/mysql.h:
  removed declaration of cli_fetch_lengths per Kostja's suggestion
libmysql/libmysql.c:
  moved mysql_fetch_lengths to client.c (for server to access) per Kostja's
  suggestion
sql-common/client.c:
  added back 'static' to function definition, added mysql_fetch_lengths
sql/ha_federated.cc:
  changed to use defines as opposed to hardcoded values
sql/ha_federated.h:
  took out duplicate table_flag, fixed a resolve mistake
2005-02-23 00:29:57 -08:00
unknown
65492347e8 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.patg.net:/home/patg/mysql-5.0


sql/handler.cc:
  Auto merged
2005-02-22 11:02:21 -08:00
unknown
bf46e486bb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-22 18:31:30 +02:00
unknown
59a39534b5 After merge fixes
mysql-test/r/strict.result:
  Update tests after merge
mysql-test/t/strict.test:
  Update tests after merge (We can't handle 2.2E-307) anymore as this is out of range with the new method to calculate double
sql/item_sum.h:
  After merge fix
  use my_strtoll10 instead of my_strtonll
2005-02-22 18:30:40 +02:00
unknown
61f2abba64 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 17:02:16 +01:00
unknown
965f2b4d6a Post review coding style fixes. 2005-02-22 18:34:14 +03:00
unknown
fa1ee8986d Fix for BUG#8579 (failing test case): Allow small differences in #rows estimate in test results 2005-02-22 18:30:44 +03:00
unknown
3d9ee100f7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-build
2005-02-22 18:22:39 +03:00
unknown
b60d8e7b00 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 16:14:30 +01:00
unknown
db895ce720 Fix for BUG#8578 "Test case 'index_merge_ror' fails on SGI irix"
Take into account that bitmap_is_set() may return any non-zero zero value when the bit is set.
2005-02-22 18:00:01 +03:00
unknown
a5a91280d2 merged
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-02-22 15:31:38 +01:00
unknown
7caef7f4aa compatibility fixes, crashing tests
include/my_sys.h:
  sol9x86, sunfire100b, qnx compatibility
mysql-test/t/rpl_rotate_logs.test:
  fix the test
sql/ha_innodb.cc:
  don't bother
sql/handler.cc:
  few more ways to crash mysqld :)
sql/handler.h:
  gdb/safemalloc workaround
sql/log.cc:
  rotate a binlog on heuristic recover
sql/mysqld.cc:
  rotate a binlog on heuristic recover
2005-02-22 15:22:37 +01:00
unknown
3bd16c794e Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-02-22 16:20:47 +02:00
unknown
bc2a229324 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-22 16:20:30 +02:00
unknown
10ffa887f0 trx0trx.c:
Disable the XA code in InnoDB crash recovery; when Jan and Sergei want to test XA, they should revert this patch


innobase/trx/trx0trx.c:
  Disable the XA code in crash recovery; when Jan and Sergei want to test XA, they should revert this patch
2005-02-22 16:18:34 +02:00
unknown
ce99d4430f Merge with 4.1
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
include/m_string.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
libmysql/libmysql.c:
  ul
mysql-test/r/ps_1general.result:
  Merge
mysql-test/t/derived.test:
  Merge
mysql-test/t/ps_1general.test:
  Merge
mysql-test/t/type_float.test:
  Merge
sql/field.cc:
  ul
sql/item.cc:
  ul
sql/item.h:
  ul
sql/item_func.h:
  ul
sql/item_strfunc.cc:
  ul
sql/item_sum.cc:
  ul
sql/item_sum.h:
  ul
sql/procedure.h:
  ul
sql/sql_derived.cc:
  Trivial merge
sql/sql_parse.cc:
  ul
sql/sql_update.cc:
  Trivial merge
strings/strtod.c:
  Use updated code from 4.1
  This is bascily same code as we had before or 5.0, execpt that we now have higher accuracy for floating points value that are integers (like 123.45E+02)
2005-02-22 15:47:00 +02:00
unknown
59554966bb Fixed a bug on InnoDB X/Open XA prepare. 2005-02-22 15:40:13 +02:00
unknown
2ae6eb094b Fix errors in my last changeset 2005-02-22 15:08:12 +02:00
unknown
acaa20e21e Clean up prints in innodb_xa_prepare. 2005-02-22 15:03:17 +02:00
unknown
1c172c3bc4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-22 14:43:14 +02:00
unknown
8b84cb93bb Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-02-22 14:40:43 +02:00
unknown
0865c81c09 Copy X/Open XA XID from trx structure to a list in recovery. 2005-02-22 14:39:15 +02:00
unknown
fe471dfd0f Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 14:34:59 +02:00
unknown
6965e72bd0 Fixed compiler warnings
Fixed failing myisam.test and rpl_rotate_logs.test on some configurations


mysql-test/r/myisam.result:
  Portability fix
mysql-test/r/rpl_rotate_logs.result:
  Portability fix
mysql-test/t/myisam.test:
  Depending on if you compiled with -DHAVE_RAID or not, you could get different errors for this test
mysql-test/t/rpl_rotate_logs.test:
  Portability fix
sql/ha_innodb.cc:
  Fixed compiler warnings
2005-02-22 14:15:50 +02:00
unknown
2fb807d1d0 A user variable are now always have IMPLICIT coercibility,
independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with 
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.


mysql-test/r/user_var.result:
  Test changes accordintly
mysql-test/t/user_var.test:
  Test changes accordintly
2005-02-22 15:55:40 +04:00
unknown
56679769a8 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-22 13:00:00 +02:00
unknown
7e028f994a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/field.cc:
  Auto merged
2005-02-22 12:51:54 +02:00
unknown
cb8d9c3ad4 Backport my_strntod() from 5.0
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)




client/mysql.cc:
  Fix wront usage of charset (found during review of pushed code)
include/m_string.h:
  Backported my_strtod() from 5.0
mysql-test/mysql-test-run.sh:
  Run also mysql_client_test with --debug
mysql-test/r/ps_1general.result:
  Safety fix (if mysql_client_test.test fails)
mysql-test/r/type_float.result:
  More test
mysql-test/t/mysql_client_test.test:
  Comments for what to do if this test fails
mysql-test/t/ps_1general.test:
  Safety fix (if mysql_client_test.test fails)
mysql-test/t/type_float.test:
  More test to better test new strtod() function
  Test also bug #7740 (wrong comparsion between integer and float-in-integer-range)
sql/field.cc:
  Backport my_strntod() from 5.0
sql/item.cc:
  Backport my_strntod() from 5.0
sql/item.h:
  Backport my_strntod() from 5.0
sql/item_func.h:
  Backport my_strntod() from 5.0
sql/item_strfunc.cc:
  Backport my_strntod() from 5.0
sql/item_sum.cc:
  Backport my_strntod() from 5.0
sql/item_sum.h:
  Backport my_strntod() from 5.0
sql/procedure.h:
  Backport my_strntod() from 5.0
strings/ctype-simple.c:
  Backport my_strntod() from 5.0
strings/ctype-ucs2.c:
  Backport my_strntod() from 5.0
strings/strtod.c:
  Backport my_strntod() from 5.0
  Change conversion to delay division as long as possible.
  This gives us more exact integer-> float conversion for numbers of type '123.45E+02'
2005-02-22 12:51:23 +02:00
unknown
f7c60b9f03 Fix name of ndb-cache-check-time
sql/mysqld.cc:
  Change _ to - for ndb-cache-check-time variable
2005-02-22 10:59:24 +01:00
unknown
8094ac95d5 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-22 10:23:24 +01:00
unknown
029f10dd85 wl1292 - ndb autotest scripts
split into script/conf for easier deployment
2005-02-22 10:18:38 +01:00
unknown
14707d71c3 ctype_latin1.result, ctype_latin1.test, charset.c:
Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.


mysys/charset.c:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
mysql-test/t/ctype_latin1.test:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
mysql-test/r/ctype_latin1.result:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
2005-02-22 09:56:07 +04:00
unknown
1329f063c0 field.cc:
optimize test_if_minus() when not UCS2 support is compiled.


sql/field.cc:
  optimize test_if_minus() when not UCS2 support is compiled.
2005-02-22 08:35:15 +04:00
unknown
17cca96ec9 MYSQL_LOG::recover was trying to allocate 0 bytes - bug#8661 2005-02-22 00:43:37 +01:00
unknown
595b46efd1 Merge. 2005-02-21 17:28:33 -06:00
unknown
06f3307b45 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-22 00:17:56 +01:00
unknown
3ad8d4ba88 bug#8646 - deadlock if long transaction causes binlog rotate
sql/sql_yacc.yy:
  duplicated symbol removed
2005-02-22 00:15:31 +01:00
unknown
8a3c137b5e corrected errors in how ndbcluster handler closes down in case of error 2005-02-21 23:29:07 +01:00
unknown
0c1dc07df0 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 23:05:13 +01:00
unknown
9785419d1e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-21 23:05:12 +01:00
unknown
7eefd9d635 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-21 20:42:34 +02:00
unknown
8cb6031dd7 Generate warning in ha_delete_table() if files is missing in handler
mysql-test/r/myisam.result:
  Test of DROP TABLE when .MYI or .MYD is missing
mysql-test/r/ndb_autodiscover.result:
  Update test results
mysql-test/r/rpl_EE_error.result:
  Change test to conform with new handling of drop table when handler file is missing
mysql-test/t/myisam.test:
  Test of DROP TABLE when .MYI or .MYD is missing
mysql-test/t/rpl_EE_error.test:
  Change test to conform with new handling of drop table when handler file is missing
sql/handler.cc:
  Generate a warning in ha_delete_table() if we get an error from 'delete_table()'
sql/handler.h:
  More parameters to ha_delete_table() so that we can generate better error messages
sql/sql_table.cc:
  Generate warning in ha_delete_table()
2005-02-21 20:41:48 +02:00
unknown
5eaa8cef88 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-21 19:11:11 +01:00
unknown
7a43b4c665 ha_innodb.cc:
Fix crash reported by Pekka Nousiainen if skip-innodb: do not try to release InnoDB's temporary latches if InnoDB has not been inited


sql/ha_innodb.cc:
  Fix crash reported by Pekka Nousiainen if skip-innodb: do not try to release InnoDB's temporary latches if InnoDB has not been inited
2005-02-21 18:54:06 +02:00
unknown
9cba39cab4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-21 20:54:05 +04:00
unknown
9c1130e27b Fix for bug #8651 (cast(sum(distinct) as decimal) crashes the server)
sql/item_sum.cc:
  curr_dec_buff should be set to 0 here
2005-02-21 20:50:56 +04:00
unknown
0baf8fabee show automatic commits in general log 2005-02-21 16:28:05 +01:00
unknown
ce793fbf1d Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 16:23:05 +01:00
unknown
ac1852b403 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-21 17:23:05 +02:00