Commit graph

11216 commits

Author SHA1 Message Date
unknown
1530dd73a0 UNHEX() function 2004-03-04 23:18:54 +01:00
unknown
ceacb0346d Comment on handler::unlock_row() 2004-03-03 12:44:00 +03:00
unknown
edf6ad9041 Bug #2959 UTF8 charset breaks joins with mixed column/string constant 2004-03-03 11:22:25 +04:00
unknown
1e3fadebda Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2004-03-02 23:08:24 +01:00
unknown
f34c3fff49 More comments on what could explain -1 in Seconds_Behind_Master in
SHOW SLAVE STATUS.
2004-03-02 23:03:52 +01:00
unknown
3a10080580 After hours of unsuccessful research on
BUG#2826 "Seconds behind master weirdness"
(sometimes this column of SHOW SLAVE STATUS shows a very big value,
in fact a small negative number casted to ulonglong).
This problem was reported by only one user, but which uses
synchronized time between his servers.
As suggested by the user, to hide this I display max(0, the value)
so that it will be less confusing. For a user, seeing 0 is probably
better than seeing -1 (both tell you that the slave is very close
to the master).


sql/slave.cc:
  Don't display a negative Seconds_Behind_Master in SHOW SLAVE STATUS.
2004-03-02 22:38:14 +01:00
unknown
aff2963c7f Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


include/my_sys.h:
  Auto merged
2004-03-02 22:22:11 +01:00
unknown
bbb3d27a5d my_getsystime() 2004-03-02 22:21:12 +01:00
unknown
7b68eaafda Desperate attempt to push part of prepared statements cleanup which was
reviewed in Saint-Petersbourg (including post-review fixes).


include/my_sys.h:
  Added clear_alloc_root (reset alloc root without freeing its memory)
sql/item.h:
  - rename setup_param -> set_parap (function assigns parameter value to item)
sql/mysql_priv.h:
  - all return values are void, because return value is never checked in
      dispatch_command
  - removed unused declaration of setup_param_functions
sql/protocol.h:
  - unused declarations of setup_params_data* removed
sql/sql_class.cc:
  Cleanup:
    - bzero(mem_root) replaced with clear_alloc_root
    - query_id and command members moved back to THD from Statement
  Assignment of mem_root, free_list, query_id and command optimized
  away from set_statement().
sql/sql_class.h:
  - query_id and command moved back to THD from Statement
sql/sql_lex.h:
  - better type for param_list
  - param_count is the same thing as param_list.elements
sql/sql_parse.cc:
  - comments for dispatch_command
sql/sql_prepare.cc:
  Cleanup:
  - added comments to many functions and removed trailing spaces in many 
    lines, some stale comments removed.
  - it's faster to iterate using pointers, than classes
  - Renames: error_in_prepare renamed to get_longdata_error (because it is set
    when there is an error in mysql_send_longdata, rather than in
    mysql_prepare), embedded versions of placeholder assignement functions
    now have prefix emb_, setup_ functions renamed to set_, because they
    perform assignment, not installation, setup_params_data now doesn't
    call insert_params and was renamed to setup_set_param_functions,
  - find_prepared_statement should not send error if called from no-reply
    calls, like mysql_stmt_reset
  - error reporting is checked up, to always report errors and not report
    errors twice. send_prep_stmt can be done mostly in send_prepare_result, 
    rather than in test_* functions.
  - now we don't need to reinit THD->mem_root/free_list in mysql_stmt_execute,
    because it's not reset there.
tests/client_test.c:
  - removed second call to test_subqueries
2004-03-02 22:39:50 +03:00
unknown
48b6cc2b2e "you need MySQL build with" may take an configure option as an argument not necessarily a define 2004-03-02 17:41:36 +01:00
unknown
8286684e26 Cleanup ha_checktype() and redundant variables.
libmysqld/lib_sql.cc:
  Removing *_skip variables
sql/ha_berkeley.cc:
  Removing *_skip variables
sql/ha_berkeley.h:
  Removing *_skip variables
sql/ha_innodb.cc:
  Removing *_skip variables
sql/ha_innodb.h:
  Removing *_skip variables
sql/ha_isam.cc:
  Removing *_skip variables
sql/ha_isam.h:
  Removing *_skip variables
sql/handler.cc:
  Removing *_skip variables
  Cleanup ha_checktype()
sql/mysqld.cc:
  Removing *_skip variables
sql/sql_show.cc:
  Removing *_skip variables
2004-03-02 10:08:50 +00:00
unknown
722e0ec378 fix for a bug #2953.
When password was granted with a global grant, then granting 
privileges on database level, without password being specified, 
will temporary (in memory) set password to ''.
2004-03-01 21:54:08 +02:00
unknown
ea023a3020 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-02-29 18:42:31 -06:00
unknown
56f8312782 bug#3011 - multi-byte charset in fulltext
myisam/ft_nlq_search.c:
  bug#3011 - multi-byte charset in fulltext
  cleanup
2004-02-29 22:58:45 +01:00
unknown
38fc3760ee Add word to error message. 2004-02-29 12:56:22 -06:00
unknown
e7776e5d0f Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-29 14:31:33 +01:00
unknown
4f457c43bc compare a decimal value with a string not a double, as we want to test for an *exact* match 2004-02-29 14:30:44 +01:00
unknown
45f39ff1de small after-merge fixes (error messages).
include/mysqld_error.h:
  more generic error code
mysql-test/r/func_compress.result:
  update after message change
mysql-test/r/loaddata.result:
  update after message change
mysql-test/r/warnings.result:
  update after message change
sql/share/czech/errmsg.txt:
  message change
sql/share/danish/errmsg.txt:
  message change
sql/share/dutch/errmsg.txt:
  message change
sql/share/english/errmsg.txt:
  message change
sql/share/estonian/errmsg.txt:
  message change
sql/share/french/errmsg.txt:
  message change
sql/share/german/errmsg.txt:
  message change
sql/share/greek/errmsg.txt:
  message change
sql/share/hungarian/errmsg.txt:
  message change
sql/share/italian/errmsg.txt:
  message change
sql/share/japanese/errmsg.txt:
  message change
sql/share/korean/errmsg.txt:
  message change
sql/share/norwegian-ny/errmsg.txt:
  message change
sql/share/norwegian/errmsg.txt:
  message change
sql/share/polish/errmsg.txt:
  message change
sql/share/portuguese/errmsg.txt:
  message change
sql/share/romanian/errmsg.txt:
  message change
sql/share/russian/errmsg.txt:
  message change
sql/share/slovak/errmsg.txt:
  message change
sql/share/spanish/errmsg.txt:
  message change
sql/share/swedish/errmsg.txt:
  message change
sql/share/ukrainian/errmsg.txt:
  message change
2004-02-28 23:36:41 +01:00
unknown
5cb14e1b31 temporary undo needed for merge
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
include/mysqld_error.h:
  for merge
mysql-test/r/loaddata.result:
  for merge
mysql-test/r/warnings.result:
  for merge
sql/share/czech/errmsg.txt:
  for merge
sql/share/danish/errmsg.txt:
  for merge
sql/share/dutch/errmsg.txt:
  for merge
sql/share/english/errmsg.txt:
  for merge
sql/share/estonian/errmsg.txt:
  for merge
sql/share/french/errmsg.txt:
  for merge
sql/share/german/errmsg.txt:
  for merge
sql/share/greek/errmsg.txt:
  for merge
sql/share/hungarian/errmsg.txt:
  for merge
sql/share/italian/errmsg.txt:
  for merge
sql/share/japanese/errmsg.txt:
  for merge
sql/share/korean/errmsg.txt:
  for merge
sql/share/norwegian-ny/errmsg.txt:
  for merge
sql/share/norwegian/errmsg.txt:
  for merge
sql/share/polish/errmsg.txt:
  for merge
sql/share/portuguese/errmsg.txt:
  for merge
sql/share/romanian/errmsg.txt:
  for merge
sql/share/russian/errmsg.txt:
  for merge
sql/share/slovak/errmsg.txt:
  for merge
sql/share/spanish/errmsg.txt:
  for merge
sql/share/swedish/errmsg.txt:
  for merge
sql/share/ukrainian/errmsg.txt:
  for merge
2004-02-28 22:33:47 +01:00
unknown
57659a4daf Fix for BUG#3000:
"replicate-wild-*-table=db.% does not apply to ALTER DATABASE"
apply replicate-* rules to ALTER DATABASE like we already do
for CREATE DATABASE/ DROP DATABASE.


sql/sql_parse.cc:
  apply replicate-* rules to ALTER DATABASE like we already do
  for CREATE DATABASE/ DROP DATABASE.
2004-02-28 22:22:29 +01:00
unknown
f5ab07d948 result update after typo fixed
mysql-test/r/loaddata.result:
  update after typo fixed
mysql-test/r/warnings.result:
  update after typo fixed
2004-02-28 22:10:57 +01:00
unknown
a327ff8f7f minor compress() cleanup
sql/item_strfunc.cc:
  typo fixed
sql/share/english/errmsg.txt:
  wording
2004-02-28 18:45:27 +01:00
unknown
9a3c6836ea Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-28 18:26:19 +01:00
unknown
89add1df32 update max_used_connections *after* thread_count was increased to take into account the current connection 2004-02-28 18:08:55 +01:00
unknown
ef42d559b1 - fixed another HP-UX compile error ("Member 'set_item_arena' not declared
in class Statement")
2004-02-28 17:34:22 +01:00
unknown
31531bfae5 make func_misc portable
on different systems sprintf("%.3", 1.555499999999999) behaves differently
2004-02-28 11:24:49 +01:00
unknown
30a8a65238 fix CHARSET(UUID()) 2004-02-27 23:59:09 +01:00
unknown
b2674f76c1 restored func_misc.result after my_strtod fix 2004-02-27 23:33:29 +01:00
unknown
42f5a91f59 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2004-02-27 22:38:36 +01:00
unknown
d6b01aa546 comment corrected 2004-02-27 22:38:04 +01:00
unknown
1e191736d6 my_gethwaddr() for linux/freebsd
UUID() function


BitKeeper/etc/ignore:
  Added mysys/test_gethwaddr to the ignore list
include/my_sys.h:
  my_gethwaddr()
mysys/Makefile.am:
  my_gethwaddr
sql/item_create.cc:
  UUID() function
sql/item_create.h:
  UUID() function
sql/item_strfunc.cc:
  UUID() function
sql/item_strfunc.h:
  UUID() function
sql/lex.h:
  UUID() function
sql/mysql_priv.h:
  UUID() function
sql/mysqld.cc:
  UUID() function
sql/sql_class.cc:
  cleanup
2004-02-27 20:30:08 +01:00
unknown
fc94a719f0 - removed extraneous Item_ident:: to fix a compile error on HP-UX 2004-02-27 19:08:56 +01:00
unknown
7337c431a8 btr0cur.c:
Remove unused function btr_cur_update_sec_rec_in_place; besides, it was faulty, because even if strings are alphabetically identified, they can have different lengths


innobase/btr/btr0cur.c:
  Remove unused function btr_cur_update_sec_rec_in_place; besides, it was faulty, because even if strings are alphabetically identified, they can have different lengths
2004-02-27 19:02:51 +02:00
unknown
8d7e0a2894 Applied fixes to issues discovered during test builds on Windows.
VC++Files/libmysql/libmysql.dsp:
  strtod.c is needed to build the library.
VC++Files/libmysqld/libmysqld.dsp:
  Add include directory to resolve problem with including emb_qcache.h,
  remove opt_ft.cc (no longer in tree).
VC++Files/mysqldemb/mysqldemb.dsp:
  Add include directory to resolve problem with including emb_qcache.h,
  remove opt_ft.cc (no longer in tree).
VC++Files/mysqlserver/mysqlserver.dsp:
  Add include directory to resolve problem with including emb_qcache.h.
VC++Files/strings/MASM6x/strings.dsp:
  Remove atof.c (no longer in tree) and add strtod.c, 
  needed for the library.
VC++Files/strings/noMASM/strings.dsp:
  Remove atof.c (no longer in tree) and add strtod.c, 
  needed for the library.
VC++Files/strings/strings.dsp:
  Remove atof.c (no longer in tree) and add strtod.c, 
  needed for the library.
sql/mysqld.cc:
  A cast is required to resolve the compile error on Windows (char * is 
  not equivalent to byte *).
sql/set_var.cc:
  A cast is required to resolve the compile error on Windows (char * is 
  not equivalent to byte *).
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-02-27 17:27:07 +01:00
unknown
ada82a3daa do not use static array of pastpoints in my_strtod - it is not portable
(that is, these numbers are converted to doubles by a local OS strtod,
and on different systems they get different values)


sql/item_strfunc.cc:
  no need to check for HAVE_ISNAN here, it is taken care of in my_global.h
strings/strtod.c:
  do not use static array of pastpoints - it is not portable
  (that is, these numbers are converted to doubles by a local OS strtod,
  and on different systems they get different values)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-02-27 14:40:08 +01:00
unknown
5fea4d8145 - fixed test result: FORMAT(12345.5555,3) really should return "12,345.556" 2004-02-27 10:14:43 +01:00
unknown
cab90420f5 - really remove all traces of odbc 2004-02-26 19:32:42 +01:00
unknown
bda3122232 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/mysqld.cc:
  Auto merged
2004-02-26 00:25:35 +01:00
unknown
056a678d1a in netware ':' is also a valid path character 2004-02-24 23:15:38 +01:00
unknown
f96960f9e1 Code cleanup 2004-02-24 19:30:38 +02:00
unknown
83188d50cc Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2004-02-24 19:14:41 +02:00
unknown
8388a57a96 minor omission that effectively disabled my_strtod fixed :)
mysql-test/r/bigint.result:
  updated
mysql-test/r/func_misc.result:
  updated
mysql-test/t/bigint.test:
  updated
2004-02-24 12:31:33 +01:00
unknown
c8511afdc5 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-23 22:49:26 +01:00
unknown
b51cdbe9a8 missing break added 2004-02-23 22:48:10 +01:00
unknown
59fe74f7fb Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2719/mysql-4.1
2004-02-22 19:07:21 +04:00
unknown
27d6c04b99 found typo 2004-02-22 13:04:42 +01:00
unknown
07b40e621e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1


innobase/rem/rem0cmp.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
2004-02-22 11:01:28 +02:00
unknown
a594279dc9 Updated results 2004-02-22 10:58:22 +02:00
unknown
54cefbab0f Merge with 4.0 to get fixed tests
mysql-test/t/lock_tables_lost_commit.test:
  Auto merged
2004-02-22 10:04:08 +02:00
unknown
2100d85c4f Move tests that uses innodb to innodb.test
mysql-test/t/lock_tables_lost_commit.test:
  Ensure that innodb is compiled in
2004-02-22 09:58:51 +02:00