Commit graph

23398 commits

Author SHA1 Message Date
unknown
f21e236469 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-06-06 20:42:55 +03:00
unknown
9595c788f9 Ensure that we reset auto-increment cache if we have to do an UPDATE becasue of REPLACE
This fixes bug #11080: Multi-row REPLACE fails on a duplicate key error


mysql-test/r/auto_increment.result:
  New tests for auto-increment and replace
mysql-test/r/innodb.result:
  New tests for auto-increment and replace
mysql-test/t/auto_increment.test:
  New tests for auto-increment and replace
mysql-test/t/innodb.test:
  New tests for auto-increment and replace
mysys/my_alloc.c:
  More comments
2005-06-06 20:41:52 +03:00
unknown
b775f9862a Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into monster.:D:/Work/mysql5.0
2005-06-06 11:45:42 -05:00
unknown
a0682cac47 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-06-06 19:43:07 +03:00
unknown
6e82d64863 fixes for compiler warnings from VC6
client/mysqltest.c:
  undef popen prior to redefining it to avoid compiler warning
  cast len argument to replace_dynstr_append_mem to int.  This should be ok because the 
  replace_dynstr_append method uses strlen to accomplish the same thing.
myisam/mi_create.c:
  cast myisam_block_size down to uint16 to match the struct element block_length
mysys/default.c:
  add (char*) cast to make compiler happy
mysys/my_handler.c:
  add (my_bool) cast to make compiler happy
2005-06-06 11:34:52 -05:00
unknown
4fb0b9b874 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0


sql/sql_select.cc:
  Auto merged
2005-06-06 18:03:16 +02:00
unknown
3358d7826f A logger patch for Netware. 2005-06-06 19:00:50 +03:00
unknown
32fc17371a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-06-06 18:48:01 +03:00
unknown
a1122ab06a A fix for Metrowerks compiler.
netware/BUILD/mwenv:
  A fix for Metrowerks compiler, compiler option to change enum size
  from 2 bytes to 4 bytes.
2005-06-06 18:34:44 +03:00
unknown
6fd6ad917a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/sql_select.cc:
  Auto merged
2005-06-06 18:31:38 +03:00
unknown
e515cd1b89 Some fixes for Netware.
include/my_sys.h:
  Metrowerks compiler has _alloca() nowadays.
  Netware does not have mmap()
netware/mysql_test_run.c:
  A fix for netware mysql_test_run client.
2005-06-06 18:30:59 +03:00
unknown
9d5e2e915a Some fixes for Netware builds.
netware/BUILD/compile-linux-tools:
  A patch for Netware builds. This fixes problem with missing mysql_version.h during Linux
  tools building.
netware/BUILD/compile-netware-END:
  A fix for Netware builds.
netware/BUILD/mwenv:
  A fix for Netware builds, environment variables setup script.
2005-06-06 17:59:00 +03:00
unknown
36947f1985 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/mysql_priv.h:
  Auto merged
2005-06-06 16:54:56 +03:00
unknown
a0d18bd492 Some Windows compile improvements:
- removed some unreferenced variables
 - fixed the libmysql project file by removing a duplicate file reference (merge error)


sql/item_func.cc:
  - removed unused variable "Field" from Item_func_sp::sp_result_field
sql/sql_select.cc:
  - removed unreferenced variable "filename" from create_tmp_table
sql/unireg.cc:
  - removed unused variable "firstpos" from make_empty_rec
VC++Files/libmysql/libmysql.dsp:
  - after-merge fix: removed duplicate file ctype-cp932.c
2005-06-06 15:23:04 +02:00
unknown
4e12564589 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


sql/sql_select.cc:
  Auto merged
2005-06-06 06:15:09 -07:00
unknown
3b808af0fd sp.test, sp.result:
Added a test case for bug #6866.
sql_select.cc:
  Fixed bug #6866.
  Bug was due to the fact that on_expr was not backed up
  for the second execution of the stored procedure.


sql/sql_select.cc:
  Fixed bug #6866.
  Bug was due to the fact that on_expr was not backed up
  for the second execution of the stored procedure.
mysql-test/r/sp.result:
  Added a test case for bug #6866.
mysql-test/t/sp.test:
  Added a test case for bug #6866.
2005-06-06 06:05:11 -07:00
unknown
22eeea0490 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.turk
2005-06-06 16:55:06 +05:00
unknown
e7300f1346 Bug#8610: The ucs2_turkish_ci collation fails with upper('i')
UPPER/LOWER now can return a string with different length.

mi_test1.c:
  Adding new arguments.
Many files:
  Changeing caseup/casedn to return a result with different
  length than argument.
sql_string.h:
  Removing unused method,
mysql_priv.h:
  Removing unused method


strings/ctype-big5.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-bin.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-cp932.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-czech.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-euc_kr.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-extra.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-eucjpms.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-gb2312.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-gbk.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-latin1.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-mb.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-simple.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-sjis.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-tis620.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-uca.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-ucs2.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-ujis.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-utf8.c:
  Changeing caseup/casedn to return a result with different length than argument.
strings/ctype-win1250ch.c:
  Changeing caseup/casedn to return a result with different length than argument.
sql/item_strfunc.cc:
  Changeing caseup/casedn to return a result with different length than argument.
sql/item_strfunc.h:
  Changeing caseup/casedn to return a result with different length than argument.
sql/mysql_priv.h:
  Removing unused method
sql/sql_string.h:
  Removing unused method,
client/sql_string.h:
  Changeing caseup/casedn to return a result with different length than argument.
include/m_ctype.h:
  Changeing caseup/casedn to return a result with different length than argument.
myisam/mi_test1.c:
  Adding new arguments.
mysql-test/r/ctype_uca.result:
  UPPER/LOWER now can return a string with different length.
mysql-test/t/ctype_uca.test:
  UPPER/LOWER now can return a string with different length.
2005-06-06 16:54:15 +05:00
unknown
e0ae1fa061 Portability fix, mySTL on Sun Forte 5.4.
extra/yassl/mySTL/memory.hpp:
  Portability fix, mySTL on Sun Forte 5.4: default template arguments that
  are based on previous template argument don't work, just remove
  the fancy syntax (non-default second argument is not used anywhere
  anyway).
2005-06-06 15:52:45 +04:00
unknown
8ae95213fb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/sp_head.cc:
  Auto merged
sql/sp_rcontext.cc:
  Auto merged
2005-06-06 14:36:21 +03:00
unknown
cdb905ead5 Fixed wrong key length when using MIN() optimization (non fatal, but caused InnoDB to write warnings to the log file)
This fixed bug #11039: InnoDB: Warning: using a partial-field key prefix in search


mysql-test/r/innodb.result:
  Added extra test for bug #11039: InnoDB: Warning: using a partial-field key prefix in search
mysql-test/t/innodb.test:
  Added extra test for bug #11039: InnoDB: Warning: using a partial-field key prefix in search
sql/opt_sum.cc:
  Fixed wrong key length when using MIN() optimization
2005-06-06 14:03:33 +03:00
unknown
09171d1b53 Futher fixes for aCC.
extra/yassl/src/handshake.cpp:
  Further fixes for aCC: rewrite c-tor invocation to not require any
  optimization from the compiler.
2005-06-06 14:52:43 +04:00
unknown
29f18223aa Futher yaSSL portability fixes: hp3750 (HP aCC + HPUX).
extra/yassl/taocrypt/src/misc.cpp:
  Futher yaSSL portability fixes: hp3750 (HP aCC + HPUX):
  we can remove these 2 ifdefed statements, as new handlers are not used
  anymore (yaSSL new doesn't throw exceptions and does not
  calls/resets new handlers as prescribed in the standard), but let's
  leave it to Todd, now just #ifdef the problematic code.
2005-06-06 14:43:21 +04:00
unknown
40beffdb1e Fix yaSSL compilation failure on ds20 (DEC CXX + Linux) 2005-06-06 14:28:00 +04:00
unknown
eff6187c94 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10539
2005-06-06 13:14:20 +05:00
unknown
595f63b374 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-06-06 08:46:15 +02:00
unknown
2d55dd5bbb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10539


sql/field.cc:
  Auto merged
2005-06-06 11:30:15 +05:00
unknown
d1e9ff363d Merge
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/func_time.result:
  SCCS merged
mysql-test/t/func_time.test:
  SCCS merged
2005-06-06 10:39:21 +05:00
unknown
5888d0396e Fix broken linking when building with ha_federated 2005-06-05 23:00:45 +04:00
unknown
9a3bb0c74d sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc:
Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION


sql/ha_federated.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
sql/sp_cache.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
sql/sp_head.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
sql/sp_pcontext.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
sql/sp_rcontext.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
2005-06-05 16:20:22 +02:00
unknown
4eb26350cb merge
client/mysql.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-06-05 17:19:50 +03:00
unknown
b08b3a1555 Cleanup during review
Simple optimization for 2 argument usage to function of variable arguments
Fix stack overrun when using 1+1+1+1+1+1+1+....
Update crash-me results for 5.0
Don't call post_open if pre_open() fails (optimization)



sql-bench/limits/mysql-4.1.cfg:
  Rename: sql-bench/limits/mysql.cfg -> sql-bench/limits/mysql-4.1.cfg
libmysql/libmysql.c:
  More portable define
mysql-test/mysql-test-run.sh:
  Write also InnoDB warnings to warnings.log
mysql-test/t/type_newdecimal.test:
  Don't get errors if innodb is not defined
mysys/my_alloc.c:
  Cleanup comments
mysys/thr_lock.c:
  Cleanup comments
sql/item.h:
  Remove not needed initializer
sql/item_func.cc:
  Simple optimization for 2 argument usage to function of variable arguments
sql/mysql_priv.h:
  We use more stackspace with the introduction of int_op() etc.
  This change ensures we don't run out of stack when doing 1+1+1+1...
  (Tested on x86, 32 bit)
sql/sp_head.cc:
  Don't call post_open if pre_open() fails
sql/sp_rcontext.cc:
  More comments
  Change so that post_open() doesn't have to be called if pre_open() fails
sql/sql_parse.cc:
  Fold long lines
sql/sql_select.cc:
  Simple reorganization to reduce number of if's
  Ensure that table_map is updated for where clause (fixed warning from valgrind)
2005-06-05 17:01:20 +03:00
unknown
dab1b26b1d Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-04 11:15:36 +02:00
unknown
8b5ac76d6b Add missing STMT_ATTR_PREFETCH_ROWS to mysql_stmt_attr_get 2005-06-04 12:37:10 +04:00
unknown
0d68fcf91b Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-04 10:23:44 +02:00
unknown
c72c3e4ca4 Merge mysql.com:/home/jimw/my/mysql-5.0-10590
into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_timefunc.cc:
  Auto merged
2005-06-03 16:06:51 -07:00
unknown
8376d81499 client/mysql.cc
make print_field_types() somewhat more useful


client/mysql.cc:
  make print_field_types() somewhat more useful
2005-06-03 21:59:33 +02:00
unknown
48078eea1e Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-06-03 20:08:38 +02:00
unknown
32c9799596 Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-06-03 19:15:16 +02:00
unknown
8e0760e7fb - include/config-win.h: removed double HAVE_CHARSET_cp932 #define
- mysql-test/Makefile.am: added a pattern match for t/*.sql 
  (t/mysql_delimiter.sql was missing from the source distribution)


include/config-win.h:
  - removed double HAVE_CHARSET_cp932 #define
mysql-test/Makefile.am:
  - added a pattern match for t/*.sql (t/mysql_delimiter.sql was missing from the
    source distribution)
2005-06-03 18:20:25 +02:00
unknown
a9ccff554a Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-03 15:00:53 +02:00
unknown
2906e27a7c yassl template instantiation - don't do too much
mysys/my_access.c: remove incorrect fix
comments


extra/yassl/taocrypt/src/integer.cpp:
  yassl template instantiation - don't do too much
extra/yassl/taocrypt/src/template_instnt.cpp:
  yassl template instantiation - don't do too much
mysys/my_access.c:
  remove incorrect fix
sql/item_func.cc:
  a couple of comment. assert added.
2005-06-03 13:43:17 +02:00
unknown
29f3b76f58 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-06-03 12:58:23 +02:00
unknown
6de5ae6816 Post review fix of BUG#10969.
sql/item.h:
  Return name as LEX_STRING instead of its components.
sql/sql_yacc.yy:
  Name returned as LEX_STRING instead of its components.
2005-06-03 12:56:51 +02:00
unknown
fcb3be9f63 check-cpu fixes/improvements (Bug #11065)
- support additional platforms (OpenBSD, Darwin)
    - make use of /proc/cpuinfo CPU flag information
      (needed to distinguish EMT64 Xeons from normal ones)
    - chose the right CPU related options depending on 
      GCC version and target architecture
    - check if the chosen CPU type is actually supported
      by the GCC version , fallback to CPUs predecessor
      until test compile succeeds
2005-06-03 11:21:43 +02:00
unknown
33992678e2 Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into mysql.com:/home/hartmut/projects/mysql/dev/5.0


BUILD/Makefile.am:
  Auto merged
2005-06-03 10:35:14 +02:00
unknown
9979feb35c bundle the check-cpu helper script with source packages.
BUG#10696
2005-06-03 10:30:58 +02:00
unknown
8d0d79eda3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0
2005-06-03 11:20:43 +05:00
unknown
0305a3a112 Merge
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/field.cc:
  merging from 4.1
2005-06-03 09:44:13 +05:00
unknown
0f7a57cb5a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-03 06:40:40 +02:00