Commit graph

9830 commits

Author SHA1 Message Date
unknown
9e2b97fb25 #1169: Add --exec command to mysqltest 2003-09-24 16:13:47 +05:00
unknown
272b8d2485 A fix. Please never use 'ulong' here!
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-09-24 15:41:09 +05: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
addd5364f2 Merge script with 4.1
scripts/mysql_fix_privilege_tables.sql:
  Merge with 4.1
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-09-24 09:08:33 +03:00
unknown
792aa09ee1 Code cleanup of new patches
mysys/mf_dirname.c:
  Added comments
2003-09-23 17:06:44 +03: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
58ec8f35f7 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


extra/comp_err.c:
  Auto merged
2003-09-23 13:36:25 +03:00
unknown
a86e11ef15 Block SIGPIPE also for not threaded client programs.
Added --include and --libs_r options to mysql_config.
Added mysql_get_client_version() to client library
Fixed some minor benchmark issues



acinclude.m4:
  Fixed that 'no' is printed if openssl not used
configure.in:
  Fixed error message
extra/comp_err.c:
  Skip lines before first {
include/mysql.h:
  Indentation cleanup
libmysql/libmysql.c:
  Block SIGPIPE also for not threaded programs.
  This is now done once in mysql_server_init() and not for every call to mysql_init().
  Added mysql_get_client_version()
libmysql/libmysql.def:
  added mysql_get_client_version
scripts/Makefile.am:
  Add openssl libraries to mysql_config
scripts/mysql_config.sh:
  Added options --include and --libs_r
  Added C compiler options to 'cflags'
scripts/mysql_install_db.sh:
  Fixed tests with IN_RPM to not give warnings
sql-bench/bench-init.pl.sh:
  Updated version number
sql-bench/server-cfg.sh:
  Remove duplicate line
sql-bench/test-alter-table.sh:
  Increase loops for more relevant test
sql-bench/test-select.sh:
  Fix wrong test for count_distinct_2
tests/mail_to_db.pl:
  Default db and table for easier usage
2003-09-23 13:36:01 +03: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
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
864571fd97 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-09-19 19:48:44 +02: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
3d52d94e02 Merge 2003-09-18 14:38:14 +02:00