Commit graph

9564 commits

Author SHA1 Message Date
unknown
f3051834e6 Add missing define (after merge) 2003-09-29 22:06:31 +03:00
unknown
a582bf83a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.mysql.fi:/home/my/mysql-4.1
2003-09-24 11:57:27 +03:00
unknown
e9299e6da9 regexp worked only with the default character set.
Now it can work with any character set.
2003-09-24 13:57:26 +05:00
unknown
74e3399af1 merge
sql/item_strfunc.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
sql/net_serv.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2003-09-24 10:24:56 +03:00
unknown
4e09f14b18 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2003-09-24 10:24:55 +03:00
unknown
07001f78ec - Code cleanup: replaced C++-style comments with the proper syntax for
.c files (the IBM Visual Age C compiler aborts with a syntax error
   on these)


libmysql/dll.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
libmysql/libmysql.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
mysys/my_getopt.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
sql/net_serv.cc:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
strings/ctype-bin.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
tests/client_test.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
2003-09-24 08:35:02 +02:00
unknown
51f7838ab4 - added option "--readline" to enable linking against libreadline
(instead of libedit, which is the default for 4.1)
 - brushed up the usage help text a bit
2003-09-23 13:45:13 +02:00
unknown
32652464bb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-868
2003-09-23 14:05:04 +04:00
unknown
7bf99d120c derror.cc:
Typo fix: redundant "in"


sql/derror.cc:
  Typo fix: redundant "in"
2003-09-23 15:00:58 +05:00
unknown
c3a58133b2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-868
2003-09-23 13:28:48 +04:00
unknown
2d7beead44 charset.c:
comp_err failed to compile error message file when a
  character set was not incompiled.


mysys/charset.c:
  comp_err failed to compile error message file when a
  character set was not incompiled.
2003-09-23 10:41:58 +05:00
unknown
cdd3acc7e1 derror.cc:
Better English message


sql/derror.cc:
  Better English message
2003-09-23 10:06:27 +05:00
unknown
af7cb104b2 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2003-09-23 00:38:26 +02:00
unknown
a448d7696c - Polished mysql-copyright a bit and added call to remove
cmd-line-utils/readline from the commercial distribution
 - fixed some copyright headers so mysql-copyright can process them


Build-tools/mysql-copyright:
   - remove the cmd-line-utils/readline directory from the commercial
     distribution
   - make use of more builtin Perl functions instead of forking 
     subprocesses
include/my_pthread.h:
   - fixed copyright header
sql/filesort.cc:
   - fixed copyright header
sql/gen_lex_hash.cc:
   - fixed copyright header
sql/item.h:
   - fixed copyright header
sql/item_cmpfunc.cc:
   - fixed copyright header
sql/records.cc:
   - fixed copyright header
2003-09-23 00:38:01 +02:00
unknown
c4d9dc7dcf Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-22 17:28:19 +05:00
unknown
de826fdbfb Bug 1181 fix. LIKE didn't work with UCS2 character set. 2003-09-22 17:18:47 +05:00
unknown
bc26c1ff86 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-868
2003-09-22 11:00:51 +04:00
unknown
dc11b113b2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1


sql/item_strfunc.cc:
  Auto merged
2003-09-22 11:39:29 +05:00
unknown
96eb819704 xml.c:
Bug fix


strings/xml.c:
  Bug fix
2003-09-22 11:26:14 +05:00
unknown
c8cf1e4eae Bug 1350 fix 2003-09-22 11:11:36 +05:00
unknown
aa4b5cda52 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-868
2003-09-20 23:57:11 +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
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
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
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
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
abd0afa368 Preparing to support character set in error messages 2003-09-17 14:25:04 +05: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
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
unknown
2e95bcc477 Bug fix:
SET character_set_connection=newcharset;
  SELECT hex('text');

The above sequence failed in some cases.
2003-09-16 17:14:23 +05:00
unknown
48869febe6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2003-09-16 14:52:38 +03:00
unknown
076b089a36 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-16 16:36:13 +05:00
unknown
414bd57b33 UCS tests 2003-09-16 16:26:33 +05:00
unknown
3952cb0f6c Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt


sql/sql_class.h:
  Auto merged
2003-09-16 16:07:00 +05:00