Commit graph

24403 commits

Author SHA1 Message Date
unknown
73bbed107c - removed Docs/README.1st (it's obsolete)
BitKeeper/deleted/.del-README.1st~918382b11c609069:
  Delete: Docs/README.1st
2005-07-05 09:15:37 +02:00
unknown
8226e5fcbd Merge gbichot@bk-internal:/home/bk/mysql-5.0
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod-gcc
2005-07-05 01:40:38 +02:00
unknown
fe4c99ca39 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-07-05 01:40:37 +02:00
unknown
c26dafdf10 Merge gbichot@bk-internal:/home/bk/mysql-5.0
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod-gcc
2005-07-05 01:40:37 +02:00
unknown
3a0cec0578 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-jul4
2005-07-04 23:40:36 +00:00
unknown
5e212a7231 BUG#9814: post-review fixes: clear thd->net.no_send error after SP instruction
execution, not before.
2005-07-04 23:40:01 +00:00
unknown
b87b32555e Fix for BUG#9814: Clear thd->net.no_send_error before each SP instruction
execution. Failure to do so caused the erroneous statements to send nothing
and hang the client.


mysql-test/r/sp-error.result:
  Testcase for BUG#9814. Note that the result demonstrates that currently
  mysql-test-run ignores errors in multi-statement if they arrive after first 
  resultset has been received.
mysql-test/t/sp-error.test:
  Testcase for BUG#09814.
2005-07-04 23:00:23 +00:00
unknown
1a26057428 Making rpl_until more robust if machine is slow. Removing rpl_trunc_binlog
which is wrong now that slave recovers gracefully from a crashed binlog (thx Serg).
stat -> my_stat in my_copy.c so that failing stat() does not hang client connection.


BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
  Delete: mysql-test/t/rpl_trunc_binlog.test
BitKeeper/deleted/.del-rpl_trunc_binlog.result~14b4a61886a332e8:
  Delete: mysql-test/r/rpl_trunc_binlog.result
mysql-test/std_data/trunc_binlog.000001:
  Rename: BitKeeper/deleted/.del-trunc_binlog.000001~b504d840c7efde25 -> mysql-test/std_data/trunc_binlog.000001
mysql-test/t/rpl_until.test:
  making test more robust if machine is slow. We still need to sleep before testing if slave SQL thread stopped, because otherwise it may not have started yet when we test for stop, then we would return too early. When we have "START SLAVE" wait a few secs until slave threads actually started well (WL#2688) these "sleep 2" could be removed.
mysys/my_copy.c:
  Using my_stat() instead of stat(). Reason is that my_stat() reports an error message if wanted (MY_WME),
  which is critical for an error being sent to the client. Before this patch, a failing stat() caused
  the client connection to hang (because error was not set because my_error was never called).
  Adding an assertion to match the comment at the start of the function.
2005-07-04 22:27:16 +02:00
unknown
0362dcf543 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-07-04 22:20:11 +02:00
unknown
d933532240 Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build


support-files/mysql.spec.sh:
  Auto merged
2005-07-04 22:14:14 +02:00
unknown
175f12fdc0 - The Max package should Require a matching MySQL-server package. Automatically replace
the version string with the base version of the current build
2005-07-04 22:11:38 +02:00
unknown
e9ac18c204 Fixed indentation 2005-07-04 20:36:38 +02:00
unknown
ba50dc04d2 Merge mysql.com:/space/my/mysql-5.0
into mysql.com:/space/my/mysql-5.0-build
2005-07-04 17:46:28 +02:00
unknown
8d6bf38e64 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-merge
2005-07-04 17:45:56 +02:00
unknown
d6be1d8950 Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-5.0-build


configure.in:
  Auto merged
sql/sql_udf.cc:
  Auto merged
2005-07-04 16:43:55 +02:00
unknown
fd67efb6c2 - manual merge
sql/sql_udf.cc:
  Auto merged
configure.in:
  - merge: keep local version number
2005-07-04 16:05:20 +02:00
unknown
a1da992f4f Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0-current


sql/ha_innodb.cc:
  Auto merged
2005-07-04 16:12:08 +03:00
unknown
5d82b41e3a After merge fixes
mysql-test/r/group_by.result:
  After merge fix
  (Put test in same order as in 4.1)
mysql-test/t/group_by.test:
  After merge fix
  (Put test in same order as in 4.1)
sql/item_cmpfunc.cc:
  After merge fix (+ simple fix to not allow compiler to do tail optimization)
sql/item_cmpfunc.h:
  After merge fix
2005-07-04 16:01:04 +03:00
unknown
df846c4ae5 Merge mysql.com:/space/my/mysql-4.0.25-clone
into mysql.com:/space/my/mysql-4.0-build
2005-07-04 12:59:20 +02:00
unknown
ece95b3d4b - bumped up version number in configure.in to 4.0.26
configure.in:
  - bumped up version number to 4.0.26
2005-07-04 12:58:53 +02:00
unknown
c588e9f1ce Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/b11678-mysql-4.1
2005-07-04 11:09:15 +02:00
unknown
3c82f72091 manual merge
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
2005-07-04 03:50:04 +03:00
unknown
306ebf7b1c Fixes during review of new code
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling


myisam/mi_unique.c:
  Improved comments
myisam/myisampack.c:
  Updated version number
mysql-test/r/group_by.result:
  Added test that was lost during earlier merge
mysql-test/r/information_schema.result:
  Safety fix: Drop procedures before used
mysql-test/t/group_by.test:
  Added test that was lost during earlier merge
mysql-test/t/information_schema.test:
  Safety fix: Drop procedures before used
mysys/hash.c:
  Updated comment
sql/field.cc:
  false -> FALSE
sql/ha_ndbcluster.cc:
  Fix some style issues
  - No () around argument to 'case'
  - Space before ( in switch and if
  - Removed 'goto'
  - Added {}
  - Added () to make expressions easier to read
  - my_snprintf -> strmov
sql/handler.cc:
  if( -> if (
sql/item.cc:
  Indentation changes
sql/item.h:
  false -> FALSE
sql/item_cmpfunc.cc:
  Ensure that Item_func_case() check for stack overrun properly
sql/item_cmpfunc.h:
  Ensure that Item_func_case() check for stack overrun properly
sql/item_func.cc:
  Indentation fixes
  Fixed wrong goto label
sql/mysqld.cc:
  Remove test for opt_disable_networking as this flag can never be set here
sql/opt_range.cc:
  Simplify code
sql/sql_class.h:
  Move define out from middle of class definition
sql/sql_parse.cc:
  Remove extra empty lines
sql/sql_select.cc:
  use real_item() instead of (Item_ref*) item
  Modifed function comment to be align with others
  Simple optimization
sql/sql_union.cc:
  Portability fix:
  Don't use 'bool_variable|=...'
sql/sql_view.cc:
  Move List_iterator_fast out from loops (rewind is faster than creating a new itearator)
strings/ctype-utf8.c:
  if( -> if (
strings/ctype.c:
  Remove disabled code
strings/decimal.c:
  Indentation fixes
strings/xml.c:
  Indentation fixes
2005-07-04 03:42:33 +03:00
unknown
428830c500 After merge fixes
Better fix for ON DUPLICATE KEY UPDATE


mysql-test/r/group_by.result:
  After merge fixes
mysql-test/r/select.result:
  Reorder test to match 4.1 tests (will make future merges easier)
mysql-test/t/group_by.test:
  Added --disable_ps_protocol to avoid extra warning
mysql-test/t/select.test:
  Reorder test to match 4.1 tests (will make future merges easier)
sql/mysql_priv.h:
  Better fix for ON DUPLICATE KEY UPDATE
sql/sql_base.cc:
  After merge fixes
sql/sql_insert.cc:
  Better fix for ON DUPLICATE KEY UPDATE
  (old solution gave problem with item->cached_table)
sql/sql_prepare.cc:
  Better fix for ON DUPLICATE KEY UPDATE
2005-07-04 03:24:25 +03:00
unknown
fbdfcae6a9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug_qc-4.1
2005-07-04 01:36:55 +03:00
unknown
b17793f5b5 merge 2005-07-04 01:36:06 +03:00
unknown
eeee5fb10b Merge with 4.1
Makefile.am:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Keep old
client/mysqldump.c:
  Manual merge
client/mysqltest.c:
  Automatic merge
configure.in:
  Manual merge
mysql-test/r/ctype_ucs.result:
  Auto merge
mysql-test/r/func_str.result:
  Auto merge
mysql-test/r/group_by.result:
  Auto merge
mysql-test/r/insert_select.result:
  Auto merge
mysql-test/r/insert_update.result:
  Auto merge
mysql-test/r/lowercase_table2.result:
  Auto merge
mysql-test/r/select.result:
  Manual merge
mysql-test/r/variables.result:
  Auto merge
mysql-test/t/ctype_ucs.test:
  Auto merge
mysql-test/t/func_str.test:
  Auto merge
mysql-test/t/group_by.test:
  Auto merge
mysql-test/t/insert_select.test:
  Auto merge
mysql-test/t/insert_update.test:
  Auto merge
mysql-test/t/ndb_alter_table.test:
  Auto merge
mysql-test/t/select.test:
  Auto merge
mysql-test/t/variables.test:
  Auto merge
mysys/my_access.c:
  Auto merge
scripts/make_win_src_distribution.sh:
  Auto merge
sql/field.cc:
  Manual merge
sql/ha_ndbcluster.cc:
  Auto merge
sql/handler.cc:
  Auto merge
sql/item.cc:
  Auto merge
sql/item.h:
  Manual merge
sql/item_cmpfunc.h:
  Auto merge
sql/item_strfunc.cc:
  Auto merge
sql/item_strfunc.h:
  Auto merge
sql/mysql_priv.h:
  manual merge
sql/mysqld.cc:
  manual merge
sql/opt_range.cc:
  manual merge
sql/set_var.cc:
  Auto merge
sql/sql_base.cc:
  manual merge
  Restore processing of ON DUPLICATE KEY UPDATE
sql/sql_insert.cc:
  manual merge
  Restore processing of ON DUPLICATE KEY UPDATE
  Simplify mysql_prepare_insert by using local variable for select_lex and save old values just before they are changed
sql/sql_parse.cc:
  Restore processing of ON DUPLICATE KEY UPDATE
sql/sql_prepare.cc:
  New ON DUPLICATE KEY UPDATE handling
sql/sql_select.cc:
  manual merge
sql/sql_table.cc:
  auto merge
sql/sql_yacc.yy:
  auto merge
strings/ctype-ucs2.c:
  auto merge
strings/ctype-utf8.c:
  auto merge
2005-07-03 14:17:52 +03:00
unknown
6d9bc9c8b7 do not register changes of stack variable
sql/item.cc:
  new argument of find_field_in_tables()
sql/mysql_priv.h:
  new argument of find_field_in_tables()
sql/sp.cc:
  new argument of find_field_in_tables()
sql/sql_base.cc:
  new argument of find_field_in_tables()
sql/sql_help.cc:
  new argument of find_field_in_tables()
2005-07-03 00:51:02 +03:00
unknown
c7ab92c28a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-07-02 20:18:43 +03:00
unknown
2e16838c42 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
2005-07-02 16:13:35 +03:00
unknown
be515e075c fixed var_samp printing (BUG#10651)
mysql-test/r/view.result:
  Using var_samp with view (BUG#10651)
mysql-test/t/view.test:
  Using var_samp with view (BUG#10651)
sql/item_sum.h:
  fixed var_samp printing
2005-07-02 16:12:32 +03:00
unknown
7e8c38656f fixed difference between ps-protocol and usual execution
mysql-test/r/view.result:
  removed wrong warning
sql/sql_view.cc:
  fix_fields have to be (and will be) made later
2005-07-02 13:16:30 +03:00
unknown
e9cb2fb35b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged
2005-07-02 02:07:26 +02:00
unknown
2fec2ba4c9 configure.in:
Enable build with CXX=gcc and gcc version 4


configure.in:
  Enable build with CXX=gcc and gcc version 4
2005-07-02 02:00:56 +02:00
unknown
18266bedb4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-07-02 01:49:22 +02:00
unknown
c75eae3578 row0sel.c:
Optimize speed: no need to keep track of set new rec locks in a consistent read


innobase/row/row0sel.c:
  Optimize speed: no need to keep track of set new rec locks in a consistent read
2005-07-02 00:39:47 +03:00
unknown
de21d09d8b Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-07-01 23:16:28 +03:00
unknown
c2323bae9a trx0trx.h, trx0trx.ic, row0mysql.c:
Fix another bug in the fix of Bug #3300


innobase/row/row0mysql.c:
  Fix another bug in the fix of Bug #3300
innobase/include/trx0trx.ic:
  Fix another bug in the fix of Bug #3300
innobase/include/trx0trx.h:
  Fix another bug in the fix of Bug #3300
2005-07-01 22:53:08 +03:00
unknown
5bcbe404c0 trx0trx.ic, trx0trx.h:
Fix bug in the Bug #3300 bug fix


innobase/include/trx0trx.h:
  Fix bug in the Bug #3300 bug fix
innobase/include/trx0trx.ic:
  Fix bug in the Bug #3300 bug fix
2005-07-01 21:06:23 +03:00
unknown
8561600a5a Many files:
Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE


sql/ha_innodb.cc:
  Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
innobase/row/row0mysql.c:
  Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
innobase/row/row0sel.c:
  Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
innobase/include/trx0trx.ic:
  Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
innobase/include/row0mysql.h:
  Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
innobase/include/trx0trx.h:
  Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
innobase/lock/lock0lock.c:
  Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
innobase/trx/trx0trx.c:
  Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
2005-07-01 20:44:35 +03:00
unknown
f831ab6561 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-4.1
2005-07-01 20:14:55 +03:00
unknown
534ab53c17 fixed create_distinct_group() to make references via ref_pointer_array 2005-07-01 20:13:07 +03:00
unknown
8d6c08960c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl1-mysql-5.0
2005-07-01 21:40:57 +05:00
unknown
ac480a3764 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/home/pem/work/mysql-5.0
2005-07-01 17:01:03 +02:00
unknown
d0df504b83 Fix a crash I introduced by the last push. 2005-07-01 19:01:02 +04:00
unknown
672dffcaf2 WL#2286 - Compile MySQL w/YASSL support
Merge with latest yaSSL. It includes fix for bigendian/littleendian
problem (fixes func_encrypt test failure). Our trees are in sync now.


extra/yassl/include/yassl_types.hpp:
  Merge with latest yaSSL.
extra/yassl/src/Makefile.am:
  Merge with latest yaSSL.
extra/yassl/src/buffer.cpp:
  Merge with latest yaSSL.
extra/yassl/src/cert_wrapper.cpp:
  Merge with latest yaSSL.
extra/yassl/src/lock.cpp:
  Merge with latest yaSSL.
extra/yassl/src/log.cpp:
  Merge with latest yaSSL.
extra/yassl/src/socket_wrapper.cpp:
  Merge with latest yaSSL.
extra/yassl/src/template_instnt.cpp:
  Merge with latest yaSSL.
extra/yassl/src/timer.cpp:
  Merge with latest yaSSL.
extra/yassl/src/yassl_error.cpp:
  Merge with latest yaSSL.
extra/yassl/src/yassl_int.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/types.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/Makefile.am:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/aestables.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/algebra.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/arc4.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/coding.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/file.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/integer.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/misc.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/random.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/template_instnt.cpp:
  Merge with latest yaSSL.
2005-07-01 20:00:59 +05:00
unknown
07d1323f1f Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/home/pem/work/mysql-5.0
2005-07-01 16:13:36 +02:00
unknown
799ea10e24 Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/b11678-mysql-4.1
2005-07-01 16:13:05 +02:00
unknown
b4751a9314 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-07-01 16:11:30 +02:00
unknown
407d245be2 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/home/pem/work/mysql-5.0
2005-07-01 15:52:42 +02:00