Commit graph

10028 commits

Author SHA1 Message Date
unknown
f46ca5fbe9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-opssl
2003-09-20 23:13:31 +04:00
unknown
eb76a9b6ec code cleanup: removed unused constructors and methods
sql/item_subselect.cc:
  removed unused constructors
sql/item_subselect.h:
  removed unused constructors & methods
2003-09-20 18:31:56 +03:00
unknown
e603c1efde fixed processing aggregate functions with static tables (BUG#1318)
mysql-test/r/func_group.result:
  test of BUG#1318
mysql-test/r/subselect.result:
  correct results
mysql-test/t/func_group.test:
  test of BUG#1318
sql/sql_select.cc:
  hixed processing of static tables
2003-09-20 18:30:36 +03:00
unknown
0a58c2ae87 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-19 19:08:43 +02:00
unknown
11c19587e1 removing my chmods so that the test can be run on non-Unix platforms
(kind request from the Novell team).
Note that old chmods in rpl_rotate_logs remain.


mysql-test/r/rpl000009.result:
  result update
mysql-test/t/rpl000009.test:
  removing my chmods so that the test can be run on non-Unix platforms.
2003-09-19 19:07:41 +02:00
unknown
077cea73be Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340
2003-09-19 20:34:59 +04:00
unknown
992587f411 Bugfix for bug #1340, style fix before push
client/mysqlbinlog.cc:
  Small fix to avoid double initialization
2003-09-19 20:34:58 +04:00
unknown
d59e2b8f24 - fixed several typos ("uppdate"->"update" and "tryed"->"tried")
extra/comp_err.c:
   - fixed typo: "uppdate" -> "update"
heap/hp_test2.c:
   - fixed typo: "uppdate" -> "update"
   - fixed typo: "tryed" -> "tryed"
isam/test2.c:
   - fixed typo: "uppdate" -> "update"
   - fixed typo: "tryed" -> "tryed"
myisam/mi_test2.c:
   - fixed typo: "uppdate" -> "update"
   - fixed typo: "tryed" -> "tryed"
2003-09-19 18:34:57 +02:00
unknown
f89e03fd78 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340


client/mysqlbinlog.cc:
  Auto merged
2003-09-19 20:34:57 +04:00
unknown
eac3b0682a Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1073/mysql-4.0


client/mysqlbinlog.cc:
  Auto merged
2003-09-19 12:34:56 -04:00
unknown
d298968073 comp_err.c:
There are some problems compiling with pure "configure"
  I need to fix it first.


extra/comp_err.c:
  There are some problems compiling with pure "configure"
  I need to fix it first.
2003-09-19 18:16:32 +05:00
unknown
2a036dfa14 Fix for bug #1340 (More careful checks if we met proper Create_file_log_event before Append or Exec event we are processing now)
client/mysqlbinlog.cc:
  More accurate checks if Create_file_log_event is absent for this Append or Exec event...
2003-09-19 16:43:56 +04:00
unknown
4935e67c4f New test for UTF8 functionality 2003-09-19 16:59:14 +05:00
unknown
127d402ef8 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/item_func.cc:
  Auto merged
2003-09-19 15:19:15 +05:00
unknown
44bffa0b05 Fixed that multibyte charsets didn't honor multibyte
sequence boundaries in functions LIKE and LOCATE in
the case of "binary" collation. Comparison was done
like if the strings were just a binary strings without
character set assumption.
2003-09-19 15:18:19 +05:00
unknown
2d46389ac8 SCRUM
embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?


client/mysqltest.c:
  hash_insert ->my_hash_insert
include/hash.h:
  hash_insert ->my_hash_insert
mysys/hash.c:
  hash_insert ->my_hash_insert
mysys/testhash.c:
  hash_insert ->my_hash_insert
sql/ha_berkeley.cc:
  hash_insert ->my_hash_insert
sql/ha_innodb.cc:
  hash_insert ->my_hash_insert
sql/hash_filo.h:
  hash_insert ->my_hash_insert
sql/item_func.cc:
  hash_insert ->my_hash_insert
sql/lock.cc:
  hash_insert ->my_hash_insert
sql/repl_failsafe.cc:
  hash_insert ->my_hash_insert
sql/set_var.cc:
  hash_insert ->my_hash_insert
sql/slave.cc:
  hash_insert ->my_hash_insert
sql/sql_acl.cc:
  hash_insert ->my_hash_insert
sql/sql_base.cc:
  hash_insert ->my_hash_insert
sql/sql_cache.cc:
  hash_insert ->my_hash_insert
sql/sql_parse.cc:
  hash_insert ->my_hash_insert
sql/sql_select.cc:
  hash_insert ->my_hash_insert
sql/sql_udf.cc:
  hash_insert ->my_hash_insert
sql/table.cc:
  hash_insert ->my_hash_insert
tools/mysqlmanager.c:
  hash_insert ->my_hash_insert
2003-09-19 14:44:31 +05:00
unknown
6e92247842 SCRUM
embedded library
missed memory freeing added


libmysqld/embedded_priv.h:
  declaration added
libmysqld/lib_sql.cc:
  implementation added
libmysqld/libmysqld.c:
  mysql->thd releasing
2003-09-19 14:17:55 +05:00
unknown
83e8881a5a SCRUM
prepared statements in embedded library.
some fixes after testing


include/mysql.h:
  virtual method added
libmysql/client_settings.h:
  declaration added
libmysql/libmysql.c:
  implementation added
  mysql_fetch changed to work in both libraries
libmysqld/lib_sql.cc:
  implementation added
sql-common/client.c:
  added items in methods table
sql/client_settings.h:
  decided to remove such defines - i placed single #ifdef in client.c
2003-09-19 14:05:28 +05:00
unknown
748a351376 Test for mysqldump 2003-09-19 14:02:49 +05:00
unknown
334b634c9f Fix for the bug #1333: COMPRESS(NULL) segfaults.
mysql-test/r/func_compress.result:
  Test for the bug #1333: COMPRESS(NULL) segfaults.
mysql-test/t/func_compress.test:
  Test for the bug #1333: COMPRESS(NULL) segfaults.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-09-19 12:25:03 +05:00
unknown
4c63804846 SCRUM
embedded library
some dirty places cleaned:

uint removed from mysql.h as Miguel suggested
empty_string renamed as my_empty_string to get rid of name's intersections
using embedded library


include/mysql.h:
  uint -> unsigned int
include/mysql_com.h:
  this caused warnings when not in expression
libmysqld/lib_sql.cc:
  uint -> unsigned int
sql-common/client.c:
  uint -> unsigned int
sql/item_strfunc.cc:
  empty_string -> my_empty_string
sql/mysql_priv.h:
  empty_string -> my_empty_string
sql/set_var.cc:
  empty_string -> my_empty_string
sql/sql_class.cc:
  empty_string -> my_empty_string
sql/sql_prepare.cc:
  net_flush ifdef-ed
2003-09-18 18:58:02 +05:00
unknown
88fcf2a943 SCRUM:
embedded library
I decided to get rid of #define mysql_some_function in mysql.h
It puzzles users and makes problems with dynamic libraries

Finally, there are only two functions left, that are covered with
the #define-s and it won't hurt performance at all


client/mysqltest.c:
  that'll be faster
include/mysql.h:
  #defines changed to functions
libmysql/libmysql.c:
  that'll be faster that calls of wrapper functions
libmysqld/libmysqld.c:
  skip wrapper function
sql-common/client.c:
  skip wrapper function
2003-09-18 18:28:42 +05:00
unknown
bfe957bf39 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-18 14:35:25 +02:00
unknown
cbc431dbdf 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-09-18 13:19:19 +03:00
unknown
613d4e4447 configure.in:
Fix the problem with errmsg compilation


configure.in:
  Fix the problem with errmsg compilation
2003-09-18 14:54:53 +05:00
unknown
f354f3364d 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-09-18 10:50:53 +03:00
unknown
4535f6897f SCRUM
prepared statements in embedded library


include/mysql_com.h:
  to make net_flush() working in expressions
libmysqld/lib_sql.cc:
  some bugs fixed
libmysqld/libmysqld.c:
  we already have the define in client_settings.h
sql/protocol.cc:
  net_store_data should work that way in Protocol_prep (embedded server)
sql/protocol.h:
  definition for net_store_data
sql/sql_prepare.cc:
  now it works in embedded library
2003-09-18 12:25:00 +05:00
unknown
31109b2cf3 - force the removal of /var/lock/subsys/mysql on MySQL shutdown 2003-09-17 22:41:01 +02:00
unknown
851bb139af - added make_win_src_distribution.sh to EXTRA_SCRIPTS 2003-09-17 22:01:08 +02:00
unknown
493726836c Fixed Bug#1291, client displays wrong prompt when in the middle of
backticks.
2003-09-17 21:41:36 +03:00
unknown
5df627d473 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
2003-09-17 21:09:41 +03:00
unknown
b60a71c600 Fixed a bug in default.c, which caused quoted arguments not
being read correctly from my.cnf.
2003-09-17 21:08:40 +03:00
unknown
c5e6bcea69 Applied Monty corrections to the FULL SCAN
optimiser bug patch.


mysql-test/r/distinct.result:
  test results reverted
mysql-test/r/order_by.result:
  test results reverted
sql/sql_select.cc:
  found_constrain renamed to found_constraint
  We don't perform full cartesian product in 
  case when JOIN BUFFER is used: it was taken
  into account.
  s->read_time may contain range index read time,
  so to get full table scan time is necessary to
  call s->table->file->scan_time().
2003-09-17 21:52:05 +04:00
unknown
d1e3e9f38f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-17 20:58:31 +05:00
unknown
194f6725d4 SCRUM:
prepared statements in embedded library


include/mysql.h:
  Another 'virtual' method
libmysql/client_settings.h:
  client implementation declared
libmysql/libmysql.c:
  mysql_execute edited to work with embedded implementation
libmysqld/lib_sql.cc:
  one error fixed (we do need parameter's buffer in embedded library)
  embedded recordset transfer methods implementations added
sql-common/client.c:
  method added to the table
sql/client_settings.h:
  no prepared statements in mimiclient
sql/mysql_priv.h:
  these functions became global
sql/protocol.cc:
  the stub added
sql/protocol.h:
  had to change Protocol's interface for embedded library
sql/sql_class.h:
  i changed this only for embedded case, but i think it's better to do the
  same for remote server also
sql/sql_prepare.cc:
  parts of code #ifndef-ed
2003-09-17 20:48:53 +05:00
unknown
cf24f5acd7 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_parse.cc:
  Auto merged
2003-09-17 14:55:27 +03:00
unknown
34fc9b2b56 Charset number is now stored into error.sys by comp_err and loaded by mysqld. 2003-09-17 16:22:58 +05:00
unknown
c21755eb5f Fix bug in sp.cc:db_find_routine() which made tables remain open in some cases.
sql/sp.cc:
  Fix bug which made tables remain open in some cases.
2003-09-17 12:30:05 +02:00
unknown
11d36fa831 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-17 15:18:48 +05:00
unknown
6b05f916b8 SCRUM
prepared statements in embedded library


include/mysql.h:
  stmt_execute 'virtual' method added
include/sql_common.h:
  two functions became global
libmysql/client_settings.h:
  declaration for cli_stmt_execute
libmysql/libmysql.c:
  some functions changed to be usable from embedded library
libmysqld/lib_sql.cc:
  code for embedded stmt_execute added
sql-common/client.c:
  cli_stmt_execute added to the methods table
sql/client_settings.h:
  no need for prepared statements in miniclient
2003-09-17 15:18:18 +05:00
unknown
d8fd2ad9a1 Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0
into oak.local:/home/kostja/mysql/mysql-4.0-root
2003-09-17 14:01:18 +04:00
unknown
524fe47d0e fixed test result to be in sync with the optimiser 2003-09-17 14:00:43 +04:00
unknown
abd0afa368 Preparing to support character set in error messages 2003-09-17 14:25:04 +05:00
unknown
cfdd989098 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-09-17 12:23:15 +03:00
unknown
65aec56c57 BUG #1305: ISAM table handler should not be compiled by default under 4.1
include/config-win.h:
  ISAM table handler is no longer compiled with 4.1
2003-09-17 00:30:29 -04:00
unknown
65cf37d3fb Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-09-16 22:10:19 +02:00
unknown
a3056adeb6 Merge oak.local:/home/kostja/mysql/mysql-4.0-root
into oak.local:/home/kostja/mysql/mysql-4.0-rightnow
2003-09-16 21:26:26 +04:00
unknown
8c3e900e14 comment made more explanatory 2003-09-16 21:20:16 +04:00
unknown
cac860c793 select.test cleanup
mysql-test/r/select.result:
  unnecessary info removed from result
mysql-test/t/select.test:
  unnecessary info don't get into result any more
2003-09-16 20:28:29 +04:00
unknown
eead70fe70 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-16 17:29:29 +05:00