mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
6967 commits 2784 branches 343 tags 1.6 GiB
Commit graph

6967 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
87bc22a509 Test for mysqlbinlog 
Particularly for BUG#1340 mysqlbinlog coredumps when reading Exec
event without seeing Create_file event before


mysql-test/mysql-test-run.sh:
  Now mysqlbinlog will use proper temporary directory
 2003-09-24 23:25:58 +04:00
unknown
052f9bc37f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0
 2003-09-24 16:47:00 +05:00
unknown
97933001fd Added MYSQL_BINLOG variable. 2003-09-24 16:46:19 +05:00
unknown
d3def9c5b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-09-24 14:37:44 +03:00
unknown
931633bbbb Correct fix for buffer overruns for compressed blobs. 
(Bugs #770, #1304 and maybe #1295)
 2003-09-24 14:33:23 +03:00
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
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
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
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
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
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
31109b2cf3 - force the removal of /var/lock/subsys/mysql on MySQL shutdown 2003-09-17 22:41:01 +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
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
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
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
bfc155f01a More explicit error messages from myisamchk 
myisam/mi_check.c:
  More explicit error messages
myisam/mi_dynrec.c:
  More comments
 2003-09-16 14:45:42 +03:00
unknown
4a32d2e110 join buffer cache usage/not usage is taken 
into account to increase the cost of FULL SCAN


sql/sql_select.cc:
  more accurate FULL SCAN cost estimation:
  join buffer cache usage/not usage is taken
  into account to increase the cost
 2003-09-16 04:04:54 +04:00
unknown
447f398171 Merge oak.local:/home/kostja/mysql/mysql-4.0-root 
into oak.local:/home/kostja/mysql/mysql-4.0-rightnow
 2003-09-16 02:44:47 +04:00
unknown
dae83b4acf Merge gweir@build.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/greg/bk/4.0
 2003-09-15 17:40:13 -04:00
unknown
4c8bc54b7a Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra myTest.dsp to be copied into distributions as a fix for BUG#999 
BitKeeper/deleted/.del-.fgl~c7d07ad3164a2b48:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl
BitKeeper/deleted/.del-Clients and Tools.fgl~cfedc4432bdca9d:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~aa4045acaf293d36:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fdf~89b2af9ae5059f62:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.fgl~46b97f4278325e8:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fgl
BitKeeper/deleted/.del-Default.fgl~b9558db492415763:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Development.fgl~8207e98594fe0bee:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Development.fgl
BitKeeper/deleted/.del-Documentation.fgl~dbd86cfa42705734:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~1c366d3557e024bf:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-Default.rge~d816fd8cef3f06d5:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Registry Entries/Default.rge
BitKeeper/deleted/.del-MySQL 3.23.XX-GPL.ipr~3116ab4aa52a6b44:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/MySQL 3.23.XX-GPL.ipr
BitKeeper/deleted/.del-Servers.fgl~c809b9515fd51041:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Servers.fgl
BitKeeper/deleted/.del-Setup.dbg~f8ba4a87c5dd90a9:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~cb1fefacb45841a:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ino
BitKeeper/deleted/.del-Setup.ins~6946c5065a12572d:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~33bf58c825ff3ac8:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.obs
BitKeeper/deleted/.del-Setup.rul~8cc4dee41dcb733f:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.rul
BitKeeper/deleted/.del-Build.tsb~43a1c0d54abb5a44:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Default.shl~4bc5f71f8f0bd822:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Shell Objects/Default.shl
BitKeeper/deleted/.del-Default.shl~8b61f648197f5de3:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/String Tables/Default.shl
BitKeeper/deleted/.del-SETUP.BMP~1e85725234603bfe:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
BitKeeper/deleted/.del-Setup.tsb~5344bdc39c0e9884:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-infolist.txt~58b203247936d266:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-value.shl~98c2851db96b919e:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl
BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d:
  Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/.fgl
BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e:
  Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131:
  Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fgl
BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Development.fgl
BitKeeper/deleted/.del-Default.rge~2218627c2a901409:
  Delete: VC++Files/InstallShield/3.23.XXcom/Registry Entries/Default.rge
BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e:
  Delete: VC++Files/InstallShield/3.23.XXcom/MySQL 3.23.com.ipr
BitKeeper/deleted/.del-Servers.fgl~36147accb82f759:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Servers.fgl
BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ino
BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9:
  Delete: VC++Files/InstallShield/3.23.XXcom/Shell Objects/Default.shl
BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903:
  Delete: VC++Files/InstallShield/3.23.XXcom/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.obs
BitKeeper/deleted/.del-Setup.rul~14510a994d515f19:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.rul
BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97:
  Delete: VC++Files/InstallShield/3.23.XXcom/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74:
  Delete: VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28:
  Delete: VC++Files/InstallShield/3.23.XXcom/String Tables/Default.shl
BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a:
  Delete: VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d:
  Delete: VC++Files/InstallShield/3.23.XXcom/String Tables/0009-English/value.shl
BitKeeper/etc/ignore:
  Added hardcopy.0 to the ignore list
VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl:
  Add VERSION tags for automation
scripts/make_win_src_distribution.sh:
  Improved unix to DOS conversion, add processing of version tags in InstallShield files
 2003-09-15 17:39:50 -04:00
unknown
db03c7e89f Fixed bug in the optimiser for FULL TABLE SCAN case: 
to estimate correctly cost of full table scan we should take into
account rows read and skipped on each iteration.


mysql-test/r/distinct.result:
  Fixed test suite: now full scan is used
  less often
mysql-test/r/join_outer.result:
  Fixed test suite: now full scan is used
  less often
mysql-test/r/select_safe.result:
  Fixed test suite: now full scan is used
  less often
 2003-09-15 22:21:39 +04:00
unknown
d9167cd73b Merge mysql.com:/space/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.0-build
 2003-09-15 13:37:46 +02:00
unknown
867aec2fe4 Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with 
their newer DES_ versions.
Provided macros for backward compatibility.


include/my_global.h:
  Added macros for DES_ OpenSSL functions for compatibility with pre 0.9.7
sql/des_key_file.cc:
  Replaced deprecated OpenSSL des_ calls and types with newer
sql/item_strfunc.cc:
  Replaced deprecated OpenSSL des_ calls and types with newer
sql/mysql_priv.h:
  Replaced deprecated OpenSSL des_ types with newer
 2003-09-12 22:33:43 +04:00
unknown
cdbc2fe43a Regenerated expired CA certificate and signed dependant certificates 
SSL/cacert.pem:
  Regenerated expired CA certificate
SSL/client-cert.pem:
  Signed client certificate after regenerating CA certificate
SSL/server-cert.pem:
  Signed server certificate after regenerating CA certificate
 2003-09-12 20:41:12 +04:00
unknown
b3d7569a8a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-09-12 15:50:28 +02:00
unknown
9ff63574a2 Merge mysql.com:/space/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.0-build
 2003-09-12 15:48:53 +02:00
unknown
22ad721b1f Fix for BUG#1258 (Trying to use the mysqlbinlog with -h and -u option gives segmentation 
fault). Fix is just initializing "host" (and "user") with 0, not a string.


client/mysqlbinlog.cc:
  command-line arguments should be initialized like in mysqldump.cc to not cause
  segfault.
 2003-09-12 15:48:48 +02:00
unknown
7f659e4dad - fixed yet another C++-style comment in a .c file that made the IBM 
C compiler barf
 2003-09-12 15:48:05 +02:00
unknown
05d054cb2a Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/space/my/mysql-4.0
 2003-09-12 13:16:59 +02:00
unknown
f61743dea8 Portability fixes: 
- removed "-traditional-cpp" from the darwin6 compile flags, as it broke
   compilation with gcc-3.3 on Mac OS X and does not seem to be required 
   in general.
 - make sure to link libmysqld/examples/mysqltest.c with a C++ compiler, 
   as the embedded server library (libmysqld.a) includes C++ code. This
   broke compilation with non-gcc compilers.


configure.in:
   - removed "-traditional-cpp" from the darwin6 compile flags, as it broke
     compilation with gcc-3.3 and does not seem to be required in general.
libmysqld/examples/Makefile.am:
   - make sure to link mysqltest.c with a C++ compiler, as the embedded server
     library (libmysqld.a) includes C++ code.
 2003-09-12 12:42:34 +02:00
unknown
bc4d98c7e3 Merge heikki@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/heikki/mysql-4.0
 2003-09-12 01:36:28 +03:00
unknown
2af98e3642 row0sel.c: 
Fix buglets in previous push


innobase/row/row0sel.c:
  Fix buglets in previous push
 2003-09-12 01:35:32 +03:00
unknown
a2c6329c5a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-09-11 23:31:49 +02:00