Commit graph

10516 commits

Author SHA1 Message Date
unknown
da7ca9ba04 Post-merge fixes. 2003-12-01 18:24:09 +01:00
unknown
38f853d291 Merge 4.1 to 5.0
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/protocol_cursor.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-12-01 16:14:40 +01:00
unknown
91de6fdbce Portability fixes (for binary build)
Added --protocol to mysqlbinlog


client/mysql.cc:
  Indentation cleanup
client/mysqlbinlog.cc:
  Added protocol option
mysql-test/r/rpl_until.result:
  Update results
mysql-test/t/rpl_until.test:
  If --sleep option was given then the salve could do many retries, which affected the size of the binary log. This is fixed by not comparing the binary log size/position
sql/mysqld.cc:
  More debugging with set_maximum_open_files()
vio/viosocket.c:
  Portability fix.
2003-12-01 13:13:16 +02:00
unknown
046b80bbeb Mark position as # to make test portable 2003-11-28 21:05:53 +02:00
unknown
fd3847ce43 Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1
libmysql/libmysql.c:
  Auto merged
2003-11-28 20:44:26 +02:00
unknown
13f525c080 rpl_parse and rpl_probe don't have to be reset as they are already 0 2003-11-28 20:41:33 +02:00
unknown
c61299dc15 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-11-28 19:43:30 +02:00
unknown
90fc2b973a Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-28 18:18:58 +01:00
unknown
88d274c62f "optimization cleanup" reverted - problems on rpl_redirect test.
It happens that mysql->client_next->client_next=mysql
and mysql_close() goes into infinite loop.
Results vary from simple sigsegv (FreeBSD), to hard system lockup (Linux)
:)
2003-11-28 18:15:58 +01:00
unknown
57eda3053f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-11-28 16:22:45 +01:00
unknown
7ec796f31a In the slave I/O thread (in master.info), it seems less worse to flush
the relay log before flushing master.info.
Doing 'before' leads to duplicate event, doing after leads to missing event.
Both can be as destructive, but 'duplicate' enables us to later add detection
code to catch it. Whereas 'missing' can't be caught (it can't, because
the I/O thread can produce legal position jumps, for example if it has
ignored an event coming from this slave (rememember that starting from 4.1.1,
the I/O thread filters the server id).
2003-11-28 16:15:21 +01:00
unknown
a55db6213e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root


sql-common/client.c:
  Auto merged
2003-11-28 17:28:48 +03:00
unknown
3cbc822de2 cleanup: comment moved to proper place 2003-11-28 17:28:04 +03:00
unknown
6cb23b94cc merge with 4.0 to get fix for range bug
libmysql/libmysql.c:
  Auto merged
sql/opt_range.cc:
  Auto merged
2003-11-28 15:55:43 +02:00
unknown
15763ed5aa Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
2003-11-28 15:45:57 +02:00
unknown
e5cc604eab Fixed range optimzier bug (Bug #1828)
mysql-test/r/range.result:
  test for range optimzier bug
mysql-test/t/range.test:
  test for range optimzier bug
2003-11-28 15:45:34 +02:00
unknown
aa78084396 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-11-28 14:47:33 +02:00
unknown
f531c80155 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1


sql-common/client.c:
  Auto merged
2003-11-28 14:23:54 +02:00
unknown
7c8f81f3e9 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-28 12:51:15 +01:00
unknown
56b45eea1d Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-11-28 12:51:10 +01:00
unknown
c19f18ecd9 merged 2003-11-28 12:49:58 +01:00
unknown
931f7a3566 bug #1945. item(expression)->name=0, crash in find_item_in_list 2003-11-28 12:36:45 +01:00
unknown
ef43220170 Merge
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_derived.cc:
  keep local copy
sql/sql_union.cc:
  keep local copy
2003-11-28 13:31:38 +02:00
unknown
183b02a8ac Fix wrong last edit for last commit 2003-11-28 13:15:42 +02:00
unknown
76bf7d2224 Added missing SSL library (Should be in source distribution)
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log


Docs/mysqld_error.txt:
  Updated error messages
Makefile.am:
  Added missing SSL library (Should be in source distribution)
configure.in:
  Added missing SSL library
include/sql_common.h:
  Move duplicated prototypes
innobase/os/os0file.c:
  Added comment for line that could be removed
innobase/srv/srv0srv.c:
  Added comment for line that could be removed
innobase/srv/srv0start.c:
  Added comment for line that could be removed
innobase/trx/trx0sys.c:
  Added cast to remove compiler warning
isam/isamchk.c:
  Fixed compiler warning
libmysql/conf_to_src.c:
  Include files in proper order
myisam/mi_check.c:
  Removed else part that caused compiler warning
myisam/mi_delete.c:
  Added cast
myisam/mi_page.c:
  Added cast
myisam/mi_preload.c:
  Added cast
myisam/mi_write.c:
  Added cast
myisam/myisampack.c:
  changed 'byte' to 'current_byte' to avoid compiler warnings
mysql-test/mysql-test-run.sh:
  Removed start-from as test '<' is not portable and this can easily be done from command line
mysys/hash.c:
  Added cast
mysys/mf_wcomp.c:
  Removed not reached line
mysys/my_append.c:
  Fixed include file order to get this more portable
mysys/my_copy.c:
  Fixed include file order to get this more portable
mysys/my_redel.c:
  Fixed include file order to get this more portable
sql-common/client.c:
  More DBUG_PRINT
sql-common/pack.c:
  Added casts becasue Fortre compiler apparently compares (ulonglong) < (longlong) as signed
sql/ha_heap.cc:
  Changed variable names to not cause hidden variables
sql/ha_innodb.cc:
  Changed variable names to not cause hidden variables
sql/item.cc:
  Changed variable names to not cause hidden variables
sql/item.h:
  Changed variable names to not cause hidden variables
sql/item_cmpfunc.h:
  Changed variable names to not cause hidden variables
sql/item_func.cc:
  Changed variable names to not cause hidden variables
sql/item_subselect.cc:
  Changed variable names to not cause hidden variables
sql/item_subselect.h:
  Changed variable names to not cause hidden variables
sql/item_sum.cc:
  Changed variable names to not cause hidden variables
sql/item_timefunc.cc:
  Changed variable names to not cause hidden variables
sql/log.cc:
  Changed variable names to not cause hidden variables
sql/protocol.cc:
  Changed variable names to not cause hidden variables
sql/protocol.h:
  Changed variable names to not cause hidden variables
  Remove function not declared in protocol.cc
sql/protocol_cursor.cc:
  Changed variable names to not cause hidden variables
sql/set_var.cc:
  Added a lot of 'version_xxx' strings
  Changed 'bdb_version' to 'version_bdb'
sql/sql_class.cc:
  Changed variable names to not cause hidden variables
  Add TMP_TABLE_PARAM::init() to allow one to initialize structure several times
sql/sql_class.h:
  Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
sql/sql_derived.cc:
  Avoid copying TMP_TABLE_PARAM (Use class version instead)
sql/sql_error.cc:
  More DBUG
sql/sql_help.cc:
  Fixed compiler warning
sql/sql_lex.cc:
  Changed variable names to not cause hidden variables
sql/sql_list.h:
  Changed variable names to not cause hidden variables
sql/sql_parse.cc:
  Changed variable names to not cause hidden variables
sql/sql_select.cc:
  Changed variable names to not cause hidden variables
  Ensure that you don't send NULL to printf() for %s
  Fixed problem with printing sub selects to debug log
sql/sql_select.h:
  Changed variable names to not cause hidden variables
sql/sql_union.cc:
  Changed variable names to not cause hidden variables
  Don't use local copy of TMP_TABLE_PARAM (Caused core dump on Solaris)
sql/sql_update.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Remove warning
strings/conf_to_src.c:
  Fixed include file order
2003-11-28 12:18:13 +02:00
unknown
a723514bdd BK automerge tends to eat break; statements 2003-11-28 13:14:10 +03:00
unknown
b567fdd4f3 Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into mysql.com:/home/kostja/mysql/mysql-4.1-wl519


sql-common/client.c:
  Auto merged
2003-11-28 13:12:16 +03:00
unknown
506572b69e Second part of WL #519:
Client option secure-auth deployed on all possible layers:
- mysql client command-line and config file option
- mysql_options option MYSQL_SECURE_AUTH
- mysql_real_connect will automatically take into account that option if
  mysql->options.my_cnf_file/my_cnf_group is set


client/client_priv.h:
  added OPT_SECURE_AUTH to enum of all my_read_default_options options.
client/mysql.cc:
  added support for mysql command-line option --secure-auth
include/errmsg.h:
  added return code for option --secure-auth
include/mysql.h:
  added MYSQL_SECURE_AUTH to enum of all mysql_options options.
  added secure_auth flag to MYSQL handle
libmysql/errmsg.c:
  Error messages for option --secure-auth
sql-common/client.c:
  added check for secure-auth in mysql_real_connect:
  if password is provided, and secure-auth is on, then client will
  refuse connecting to pre-4.1.1 server
2003-11-28 13:11:44 +03:00
unknown
03092d0c24 fix:
2 forgotten 'break;' statements added
2003-11-28 02:50:58 +03:00
unknown
3fcd465575 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/kostja/mysql/mysql-4.0-root
2003-11-28 02:03:57 +03:00
unknown
047f646770 no need to zero-initialize mysql->master->{rpl_pivot, options.rpl_parse,
options.rpl_probe} as they are zero-initialized in spawn_init()
2003-11-28 01:57:05 +03:00
unknown
b5907ec192 cleanup:
no need to set rpl_parse, rpl_probe and rpl_pivot to zero as whole mysql
structure is bzeroed in mysql_init(0) few lines before
2003-11-28 01:54:34 +03:00
unknown
6573b851e3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0
2003-11-28 00:34:52 +03:00
unknown
a26c3436bd Fix for bug 1974 2003-11-28 00:31:15 +03:00
unknown
94387d4be3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-11-27 19:48:04 +02:00
unknown
8c430b22fa code coverage for UNIONs
mysql-test/r/subselect.result:
  independent subquery with union
mysql-test/r/union.result:
  converting temporary table from HEAP to MyISAM
mysql-test/t/subselect.test:
  independent subquery with union
mysql-test/t/union.test:
  converting temporary table from HEAP to MyISAM
2003-11-27 19:45:28 +02:00
unknown
48ea56a553 memory leak (no delete for query= new String) fixed 2003-11-27 19:14:16 +03:00
unknown
919b5ba6b5 Fixed BUG#1965: Opening a cursor hangs client when malformed select fails
and BUG#1966: "select 1 into a" on top-level hangs client


include/mysql_com.h:
  Added no_send_eof flag to NET for SP cursors (the simple read-only version).
mysql-test/r/sp-error.result:
  Added tests for BUG#1965 and BUG#1966.
mysql-test/t/sp-error.test:
  Added tests for BUG#1965 and BUG#1966.
sql/net_serv.cc:
  Added no_send_eof flag to NET for SP cursors (the simple read-only version).
sql/protocol.cc:
  Added no_send_eof flag to NET for SP cursors (the simple read-only version).
sql/sp_rcontext.cc:
  Use net->no_send_eof flag to prevent eofs during cursor open (instead of
  the dirty vio=0 which didn't work).
sql/sp_rcontext.h:
  Use net->no_send_eof flag to prevent eofs during cursor open (instead of
  the dirty vio=0 which didn't work).
sql/sql_yacc.yy:
  Give error message if doing SELECT ... INTO localvar even if it's outside an SP.
2003-11-27 16:48:21 +01:00
unknown
443a157c6a removed unused variable 2003-11-27 09:34:41 +02:00
unknown
35eca8e13d typo in comment 2003-11-27 00:16:34 +03:00
unknown
a43114ac70 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-11-26 20:13:00 +02:00
unknown
358799ecf7 avoiding coping tmptable_param
sql/sql_union.cc:
  fixed layout
2003-11-26 20:12:26 +02:00
unknown
09f95e71d2 cleanup 2003-11-26 20:23:28 +03:00
unknown
a189daf7be cleanup 2003-11-26 20:18:55 +03:00
unknown
4f19b5776b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1


sql/sql_union.cc:
  Auto merged
2003-11-26 19:13:05 +02:00
unknown
6491cc5e8b avoiding coping tmp_table_param 2003-11-26 19:10:30 +02:00
unknown
0b0a79e371 Fix for BUG#1960 "date_format() returns spurious '-' for valid dates".
It was a forgotten ltime->neg=0 (neg was the only forgotten variable).
I scanned field.cc for other places where we would forget to set neg, found none.
A test for the bug.


mysql-test/r/date_formats.result:
  result update
mysql-test/t/date_formats.test:
  a test for BUG#1960 "date_format() returns spurious '-' for valid dates"
sql/field.cc:
  When preparing ltime from the 3-byte date, don't forget to set ltime->neg to 0
  (otherwise it remains unitialized).
  Dates are not allowed to be negative (only times can be, when they mean a time interval),
  so it's ok to always set neg to 0.
2003-11-26 17:06:24 +01:00
unknown
e503dc2850 - fixed compile error in tests/client_test.c
(declarations should be on top of a block)


tests/client_test.c:
   - fixed compile error (declarations should be on top of a block)
2003-11-26 15:22:30 +01:00
unknown
7d784b20ae Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1-w1284


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2003-11-26 13:39:18 +04:00
unknown
6943b3236b SCRUM
WL#1284 (warnings about --skip-name-resolve)
Messages corrected


sql/share/czech/errmsg.txt:
  Message corrected
sql/share/danish/errmsg.txt:
  Message corrected
sql/share/dutch/errmsg.txt:
  Message corrected
sql/share/english/errmsg.txt:
  Message corrected
sql/share/estonian/errmsg.txt:
  Message corrected
sql/share/french/errmsg.txt:
  Message corrected
sql/share/german/errmsg.txt:
  Message corrected
sql/share/greek/errmsg.txt:
  Message corrected
sql/share/hungarian/errmsg.txt:
  Message corrected
sql/share/italian/errmsg.txt:
  Message corrected
sql/share/japanese/errmsg.txt:
  Message corrected
sql/share/korean/errmsg.txt:
  Message corrected
sql/share/norwegian-ny/errmsg.txt:
  Message corrected
sql/share/norwegian/errmsg.txt:
  Message corrected
sql/share/polish/errmsg.txt:
  Message corrected
sql/share/portuguese/errmsg.txt:
  Message corrected
sql/share/romanian/errmsg.txt:
  Message corrected
sql/share/russian/errmsg.txt:
  Message corrected
sql/share/serbian/errmsg.txt:
  Message corrected
sql/share/slovak/errmsg.txt:
  Message corrected
sql/share/spanish/errmsg.txt:
  Message corrected
sql/share/swedish/errmsg.txt:
  Message corrected
sql/share/ukrainian/errmsg.txt:
  Message corrected
sql/sql_acl.cc:
  Messages corrected
2003-11-26 13:38:32 +04:00