Commit graph

20178 commits

Author SHA1 Message Date
unknown
80ddfccfa7 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-21 16:23:04 +01:00
unknown
9a1482739e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-21 19:23:03 +04:00
unknown
cd32f96095 Tests modified to coved decimal-related code
mysql-test/r/analyse.result:
  test result extended
mysql-test/r/cast.result:
  test result extended
mysql-test/r/func_group.result:
  test result extended
mysql-test/r/subselect.result:
  test result extended
mysql-test/t/analyse.test:
  test extended
mysql-test/t/cast.test:
  test extended
mysql-test/t/func_group.test:
  test extended
mysql-test/t/subselect.test:
  test extended
2005-02-21 19:20:05 +04:00
unknown
aef137bc81 sql_parse.cc:
Fix compiler complaint.


sql/sql_parse.cc:
  Fix compiler complaint.
2005-02-21 09:15:43 -06:00
unknown
ae8c3e130a Fix -ansi -pedantic compilation failure. 2005-02-21 17:27:36 +03:00
unknown
4dc49b956a Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 15:07:27 +01:00
unknown
f3d2090efb Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-02-21 15:04:41 +01:00
unknown
2be9619682 Cleanup.
mysql-test/t/type_bit.test:
  Cleanup (we don't need to have include/have_innodb.inc here).
2005-02-21 18:03:06 +04:00
unknown
3c2e7f1e97 A minor adjustment of the previous bug fix in sp_head.cc.
(Which btw also fixed BUG#7295: Server crash when executing stored procedure,
 I just forgot to include that before.)


sql/sp_head.cc:
  A minor adjustment of the previous bug fix; moved the rollback of item changes
  to a better place which will not miss some cases.
2005-02-21 14:57:43 +01:00
unknown
926826f5da Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-02-21 17:38:37 +04:00
unknown
65410bd0a1 ctype_utf8.result, ctype_utf8.test, ctype-utf8.c:
Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same


strings/ctype-utf8.c:
  Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same
mysql-test/t/ctype_utf8.test:
  Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same
mysql-test/r/ctype_utf8.result:
  Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same
2005-02-21 17:17:30 +04:00
unknown
f36c4a9378 workaround for sun compiler on sol9x86 2005-02-21 14:04:35 +01:00
unknown
453809f3a4 Fix compiler warning/crash(ds20)
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Moved ndbrequire and break down one line, to avoid warnings and compiler crash
2005-02-21 14:01:36 +01:00
unknown
ecc4d85066 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-02-21 16:53:00 +04:00
unknown
32895fe37b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-21 14:48:44 +02:00
unknown
d50af8aece Review of new pushed code (XA & other)
Portability fixes and cleanups
Fixed setting of 'res' in mysql_execute_command()


sql/handler.cc:
  delete_table() will not return error for not found files if one handler file was found and deleted
sql/handler.h:
  Incremented MAX_HA so that ndb works again
  Don't convert char pointer to (my_xid*) as we don't know if the address is aligned on 8
sql/log.cc:
  Indentation fixes
  Simplified loop to find next log
  Fixed race condition in reset_logs that caused mix_innodb_myisam_binlog to fail
sql/log_event.cc:
  Don't convert char pointer to (my_xid*) as we don't know if the address is aligned on 8
sql/sql_acl.cc:
  Convert db name directly to avoid extra strmov
sql/sql_base.cc:
  Added comment
  Removed not needed code
sql/sql_db.cc:
  Added comment
  Remove not needed code
sql/sql_parse.cc:
  Always call mysql_rm_db() with lower case db name
  Ensure that 'res' is set correctly in mysql_execute_command()
  (One don't have to set res if one calls my_error() and res should be = 0 for correct commands)
sql/sql_repl.cc:
  Indentation fixes
  use packet->ptr() instead of packet->c_ptr()
sql/sql_table.cc:
  Join similar code when table didn't exist in engine
2005-02-21 14:47:57 +02:00
unknown
3f0fedc483 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 13:39:29 +01:00
unknown
07f2634e2c A fix (bug #7661: 'classic' shows different test effects which must be cared for)
"create table ta(a bit...) engine=innodb" moved to innodb.test


mysql-test/r/innodb.result:
  A fix (bug #7661: 'classic' shows different test effects which must be cared for)
mysql-test/r/type_bit.result:
  A fix (bug #7661: 'classic' shows different test effects which must be cared for)
mysql-test/t/innodb.test:
  A fix (bug #7661: 'classic' shows different test effects which must be cared for)
mysql-test/t/type_bit.test:
  A fix (bug #7661: 'classic' shows different test effects which must be cared for)
2005-02-21 16:39:13 +04:00
unknown
e8f888a525 mysql.cc:
bug#7571:
  Server & Client characterset are shown under different decriptions
  Switch them into the correct order.


client/mysql.cc:
  bug#7571:
  Server & Client characterset are shown under different decriptions
  Switch them into the correct order.
2005-02-21 15:43:25 +04:00
unknown
573ba7e209 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 12:24:28 +01:00
unknown
0fc34660bb Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
2005-02-21 11:57:06 +01:00
unknown
2d044701a9 xa assert fixes
sql/handler.cc:
  more DBUG
sql/handler.h:
  increase MAX_HA (ha_archive has its handlerton too)
sql/log.cc:
  fix assert
2005-02-21 11:51:50 +01:00
unknown
b526f43411 ndb - ndb_multi - reset query cache at end of test
mysql-test/r/ndb_cache_multi2.result:
  reset query cache settings on end of test
mysql-test/t/ndb_cache_multi2.test:
  reset query cache settings on end of test
2005-02-21 11:45:51 +01:00
unknown
f4966976bd Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 10:55:21 +01:00
unknown
d5e8980443 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged
2005-02-21 10:54:23 +01:00
unknown
493911bdde ndb - fix problems introduced/discovered by XA
sql/ha_ndbcluster.cc:
  Respect "all" flag so that correct transaction is released
sql/handler.cc:
  Make sure innodb temporary latches are only released if innodb is used
2005-02-21 10:53:19 +01:00
unknown
ca61f67ce9 Merge mysql.com:/home/mysqldev/tulin/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-5.0


scripts/make_binary_distribution.sh:
  Auto merged
2005-02-21 10:53:01 +01:00
unknown
afdfb1935f bug #8611, ndb includes in lib dir instead of include dir 2005-02-21 10:52:29 +01:00
unknown
a89dcc587a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-21 06:56:26 +01:00
unknown
39e14ac165 Merge
sql/ha_federated.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_federated.h:
  SCCS merged
2005-02-20 14:20:05 -08:00
unknown
b3b5f8fb65 Fix confusing comments.
sql/examples/ha_example.cc:
  fix comments, referring to renamed function
sql/ha_federated.cc:
  fix comments, referring to renamed function
2005-02-20 22:52:28 +03:00
unknown
a0a20345b9 portability fixes
mysql-test/r/mysqlbinlog.result:
  result fixed
2005-02-20 20:08:33 +01:00
unknown
10db96fe43 decimal format documented 2005-02-20 17:25:22 +01:00
unknown
1683fc9673 underflow in decimal_round fixed 2005-02-20 16:55:11 +01:00
unknown
e694e96542 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-20 15:53:40 +01:00
unknown
da4604f9e8 CPPFLAGS is substituted with CXXFLAGS to work with older automake. Serg, now you can enable
server-tools/instance-manager.


server-tools/instance-manager/Makefile.am:
  The famous CPPFLAGS (aka "upgrade automake") thing was removed. Upon Brian's request.
2005-02-20 04:36:22 +03:00
unknown
3805001f7c use dbug_print_decimal instead of DBUG_EXECUTE
Portability fix
Note: rpl_trunc_binlog fails, but Sergei has promised to fix it, so I will ignore it for now


sql/field.cc:
  use dbug_print_decimal instead of DBUG_EXECUTE
sql/item.h:
  Portability fix
sql/my_decimal.cc:
  Fix error in last changeset (not pushed)
2005-02-20 00:24:30 +02:00
unknown
915660e03d Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-19 22:25:42 +01:00
unknown
7b3df69baa fix rpl_trunc_binlog to test the new behaviour 2005-02-19 22:24:13 +01:00
unknown
a39f87f307 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
2005-02-19 21:56:24 +02:00
unknown
488de6cc3f WL# 2094, Federated Storage Handler. This patch fixes bug #8599, HPUX compile errors.
Testing on hp3750 shows these fixes fix the compile problems on HPUX, but I have 
a problem where when I run the tests, the test shows that the tables default to MyISAM!


include/mysql.h:
  HPUX's compiler does not like 'ulong' - the compile fails due to this.
sql/ha_federated.h:
  Serg's recommendation to fix bug #8599 (which is a good fix since it's obviously 
  from when I added the method via cut and paste ;). Also caught some comment style issues.
2005-02-19 10:45:19 -08:00
unknown
97e6e78006 fix for a bug with my_print_defaults with --defaults-extra-file= option 2005-02-19 19:51:47 +02:00
unknown
01ed9a3224 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into beethoven.site:/home/georg/work/mysql/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
2005-02-19 18:47:33 +01:00
unknown
3f0def3310 ndb - fix to Time comparison
ndb/src/common/util/NdbSqlUtil.cpp:
  remove stupid check
2005-02-19 18:23:25 +01:00
unknown
6c8ae9d65e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


BUILD/SETUP.sh:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/my_decimal.cc:
  Auto merged
sql/my_decimal.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-19 19:00:41 +02:00
unknown
64cc538bda Fixed BUILD script to use --with-berkeley-db instead of --with-bdb
Lots of small fixes to multi-precision-math path
Give Note for '123.4e'
Added helper functions type 'val_string_from_real()
Don't give warnings for end space for string2decimal()
Changed storage of values for SP so that we can detect length of argument without strlen()
Changed interface for str2dec() so that we must supple the pointer to the last character in the buffer



BUILD/SETUP.sh:
  with-bdb ->with-berkeley-db
include/decimal.h:
  Make string2decimal and string2decimal_fixed inline
mysql-test/r/func_group.result:
  More tests (to find bugs in precision math fixes)
mysql-test/r/func_set.result:
  Test to cover more Item_func_field::val_xxx() code
mysql-test/r/ps_6bdb.result:
  update results
mysql-test/r/type_decimal.result:
  New tests
  Give note for '123.4e'
mysql-test/r/type_newdecimal.result:
  Number of decimal changes (probably right, but hard to verify)
mysql-test/t/func_group.test:
  More tests (to find bugs in precision math fixes)
mysql-test/t/func_set.test:
  Test to cover more Item_func_field::val_xxx() code
mysql-test/t/type_decimal.test:
  New tests to cover more cases in decimal.c
sql/item.cc:
  Added helper functions type 'val_string_from_real()'
  Use new interfase to str2my_decimal()
  Moved nr_of_decimals() here (and made it static)
sql/item.h:
  Added helper functions type 'val_string_from_real()'
sql/item_func.cc:
  Style fixes
  Trivial optimizations
  Ensure null_value is set if my_decimal_add/sub/mul/div returns error
  Remove not needed Item_func_int_div::val_str()
  Join Item_func_signproc and Item_func_neg
  Fix that FIELD() works when first argument is NULL or one if it's arguments are NULL
  new str2my_decimal interface
sql/item_func.h:
  Make Item_func_int_div inherit from Item_int_func (allows us to remove some virtual functions)
  Join Item_func_signproc & Item_func_neg
sql/item_strfunc.cc:
  Move nr_of_decmails() to Item.cc (as it was only used here)
sql/item_sum.cc:
  Style fixes
  Change a lot of code to use new helper converter functions in item.cc
  Moved Item_sum::val_decimal() to Item_sum_int::val_decimal()
  Fixed calls to wrong functions (Item_sum_num::val_int())
  Ensure that all hybrid functions checks hybrid_type in val_xxx() (As there is no gurantee that they are called in the right context)
  Simplify key_length allocation in Item_sum_sum_distinct()
  Simplified create_tmp_field() and reset_field()
  Fixed potential error in Item_sum_hybrid::reset_field()
  Optimize Item_sum_avg::update_field()
  Item_std_field() functions musted be fully coded becasue Item_variance_field::val_xxx functions called helper functions
  Coded missing Item_sum_ufd_xxx::val_decimal() functions
sql/item_sum.h:
  Moved Item_sum::val_decimal() to Item_sum_int::val_decimal()
  Added missing Item_sum_ufd_xxx::val_decimal() functions
  Removed not used scale() function.
  Fixed that Item_std_field() works with decimal arguments
  Fixed that CREATE ... STD() will create a REAL field
sql/log_event.cc:
  Ensure that we use same format for all types
sql/my_decimal.cc:
  Don't give warnings for end space for string2decimal()
  Added dbug_print_decimal()
sql/my_decimal.h:
  Style fixes
  Prototypes for new functions
  New interface for str2my_decimal()
sql/mysql_priv.h:
  Made nr_of_decimals() static
sql/protocol.cc:
  Simplify code (by assume that decimal can't be bigger than DECIMAL_MAX_STR_LENGTH]
sql/protocol_cursor.cc:
  Changed storage of values for SP so that we can detect length of argument without strlen()
sql/sp_head.cc:
  Simplify code for decimal handling by letting item handling conversion to decimal
sql/sp_rcontext.cc:
  Use new method to get length of arguments
sql/sql_analyse.cc:
  if -> switch
  Increase 'empty' if decimal value=0
  Remove usage of strcat()
sql/sql_base.cc:
  Remove unnecessary checks
sql/sql_class.cc:
  Remove not needed 'else'
  Removed not used variables
sql/sql_select.cc:
  remove test for impossible condtion
strings/decimal.c:
  Made two trivial functions macros
  Changed interface for str2dec() so that we must supple the pointer to the last character in the buffer
  This safer than before as we don't require an end \0 anymore (old code gave wrong answers in MySQL for some internals strings that where not \0 terminated)
  Detect error numbers of type '12.55e'
  str2dec() will now set 'to' to zero in case of errors
2005-02-19 18:58:27 +02:00
unknown
0bc02450a6 windows compilation fixes 2005-02-19 12:15:30 +01:00
unknown
47fd010f73 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-19 11:05:35 +01:00
unknown
a98179dced fix compilation errors
sql/examples/ha_tina.cc:
  make tina to compile (wasn't catched with -max build)
sql/sql_yacc.yy:
  fix compilation errors --without-geometry
2005-02-19 10:51:49 +01:00
unknown
58c3d0abee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-19 08:22:47 +01:00