1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Commit Graph

6099 Commits

Author SHA1 Message Date
f34b63ac49 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-03 10:30:41 -04:00
1834b6ff49 Updated results after merge 2003-04-03 13:21:39 +03:00
7bc65cd823 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0
mysys/my_vsnprintf.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
2003-04-03 13:08:28 +03:00
2090bc6e43 Fixed bug in memory allocation that could affect 64 bit systems (affected hammer)
mysys/my_vsnprintf.c:
  safety fix
sql/log.cc:
  safety fix
2003-04-03 13:07:42 +03:00
f5feb33773 Merge with 3.23 to get fixes for:
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.


BitKeeper/etc/logging_ok:
  auto-union
sql/log.cc:
  Auto merged
client/client_priv.h:
  Merge with 3.23
client/mysqldump.c:
  Merge with 3.23
myisam/mi_dynrec.c:
  Merge with 3.23
mysql-test/t/myisam.test:
  Merge with 3.23
sql/log_event.cc:
  Merge with 3.23
sql/slave.cc:
  Merge with 3.23
sql/sql_delete.cc:
  Merge with 3.23
2003-04-03 12:33:13 +03:00
68fc04c423 Portability fix (for AMD hammer)
sql/log.cc:
  Portability fix (for hammer)
2003-04-03 12:10:38 +03:00
e9635c95af Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 11:29:38 +03:00
584b4caa66 Safer stack checking 2003-04-03 11:29:10 +03:00
3258bb7248 Sprint task #856 : make table exclusion rules (in replication)
apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
GRANT and REVOKE will not be replicated on the slave.
2003-04-01 22:49:40 +02:00
241b6c058d Small-and-safe fix for bug #218: "LOAD DATA INFILE IGNORE is well
logged, but read as LOAD DATA INFILE REPLACE"
This was just bad && instead of &, but nasty consequences.
This should be merged to 4.0 BUT it will not be automatic (some code
has moved from log_event.h to log_event.cc, and log_event.cc has changed);
please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
to find all the new places.


sql/log_event.cc:
  & instead of && when testing flags
sql/slave.cc:
  & instead of && when testing flags
2003-04-01 18:19:15 +02:00
7bf6bd51ff Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-31 11:28:41 -05:00
3294aac1bf Add new XDC file for NetWare pre-emption, drop old build scripts, libmysqld.def
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Delete: netware/mysqld.xdc
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
  Delete: netware/nwbootstrap
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Delete: netware/nwconfigure
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Delete: netware/libmysqld.def
2003-03-31 11:28:20 -05:00
45802e08b1 - Fix for bug #200 (added missing @WRAPLIBS@ to LIBS in
libmysqld/examples/Makefile.am (thanks to Christian Hammers from Debian
   for pointing this out)


libmysqld/examples/Makefile.am:
   - added missing @WRAPLIBS@ to LIBS
2003-03-31 14:50:29 +02:00
a424d01173 fixed bug 209 (SQL_SELECT_LIMIT and query cache incompatibility)
mysql-test/r/query_cache.result:
  test of SET OPTION SQL_SELECT_LIMIT
mysql-test/t/query_cache.test:
  test of SET OPTION SQL_SELECT_LIMIT
sql/sql_cache.cc:
  layout fixed
  SQL_SELECT_LIMIT stored in query cache now
sql/sql_parse.cc:
  room for SQL_SELECT_LAYOUT storing added
2003-03-31 09:49:09 +03:00
280a1e4ad3 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-03-30 17:16:39 +03:00
5380411728 truncating REPLACE result bug fix
mysql-test/r/func_str.result:
  test result for truncating REPLACE result
mysql-test/t/func_str.test:
  test with long arguments for REPLACE
sql/item_strfunc.cc:
  fix for counting REPLACE result length
2003-03-30 18:36:01 +05:00
c15f1acd82 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-4.0


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-03-28 15:36:42 +02:00
420686dd8e Improve make_binary_distribution from Novell code at Monty's request
netware/BUILD/create-patch:
  Change mode to -rwxrwxr-x
scripts/make_binary_distribution.sh:
  Split BIN_FILES into more generic parts, with no repetition
2003-03-27 18:13:37 -05:00
2de9dc132e Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-27 16:36:07 -05:00
e61bbc45ec Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0


sql/mysqld.cc:
  Auto merged
2003-03-27 13:54:22 +02:00
2e6c3197a9 mysqld.cc:
Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction


sql/mysqld.cc:
  Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction
2003-03-27 12:17:27 +02:00
712ea880a8 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-26 16:23:28 -05:00
f149c2776d fixed problem of port without host in SHOW PROCESSLIST (bug 189)
sql/sql_show.cc:
  fixed problem of port without host in SHOW PROCESSLIST
2003-03-26 22:04:20 +02:00
221dfec1a4 Fix for stack size checking on Solaris. 2003-03-26 14:51:22 +02:00
10b0edf399 Fix for glibc with small stack size (fixes bug when running crash-me)
sql-bench/limits/mysql.cfg:
  Update to new crash me
2003-03-26 14:11:17 +02:00
592a398f75 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
2003-03-25 19:58:40 -04:00
f4305a899a fix bug with parameters of LOAD DATA INFILE in exec_event
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-25 19:57:38 -04:00
3d6dcd6567 - fixed typo (build_command -> build-command) 2003-03-25 22:38:12 +01:00
f3a5d5aa98 - added new option "--build-command" to be able to use different
commands for building the sources
 - removed duplicate option "--revision"
 - added help for new option and reformatted help text a bit
2003-03-25 22:20:07 +01:00
5ed61c1121 crash-me.sh:
add new parameter  checks length_of_varchar_field,
  add new auxilary functions:
  get_recordset
  compare_recordset
  print_recordset


sql-bench/crash-me.sh:
  add new parameter  checks length_of_varchar_field,
  add new auxilary functions:
  get_recordset
  compare_recordset
  print_recordset
2003-03-26 00:19:56 +05:00
4291001df9 Fix for small bug #186 (If a connection has temporary tables and does
RESET MASTER, this breaks replication).
In the slave SQL thread, any DROP TEMPORARY TABLE is silently
converted to DROP TEMPORARY TABLE IF EXISTS, not to have irrelevant
"table does not exist". See comments in code or bug #186 for an example
of how irrelevant errors like this can arise.
2003-03-25 16:52:48 +01:00
f9df0feecb A fix for a bug in MyISAM with large number of NULL columns and at
least one BLOB column.
2003-03-25 14:49:43 +02:00
044b0b2588 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
2003-03-25 13:07:02 +02:00
829045100d Fixed bug with GROUP BY and alias
mysql-test/r/group_by.result:
  Test for group by + alias bug
mysql-test/t/group_by.test:
  Test for group by + alias bug
2003-03-25 13:06:20 +02:00
40c367b3c1 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-24 21:08:54 -05:00
0783e5bc2f Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-03-24 23:29:06 +02:00
3b0438c8dd Fixed bug that binary log was not locked during a DELETE FROM TABLE_NAME; 2003-03-24 23:24:45 +02:00
6f063d3369 - fixed wrong order of commands in Mac OS X Readme.txt
(Thanks to Marc Liyanage for spotting this)
2003-03-24 15:06:11 +01:00
029b110c65 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/suse80/my/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2003-03-24 12:05:05 +01:00
bd294f07c5 make myisam usable without threads (and even w/o pthread_t) 2003-03-24 11:19:28 +01:00
fd8972cfa7 Reverted fix away from 4.0, because it may in rare circumstanses
cause compatibility problems. Fix will be enabled in 4.1.
2003-03-23 11:30:45 +02:00
c1719ad057 Changed some tests to pass with new auto_increment handling,
e.g. default value is not accepted with auto_increment anymore.
2003-03-22 20:34:20 +02:00
ebedd1521c Added error in case auto_increment and default where defined
at the same time.
2003-03-22 19:55:09 +02:00
3987075012 Fix for #178 Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
Now it does not SEGV, but USER() is still badly replicated
    (it is replicated to ""), which is a lower priority bug.


sql/item_strfunc.cc:
  Fix for #178  Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
  Now it does not SEGV, but USER() is still badly replicated
  (it is replicated to ""), which is a lower priority bug.
2003-03-22 15:22:59 +01:00
2ec4163759 Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC
client/mysql.cc:
  Remove unnecessary pthread_yield calls for NetWare
client/mysqldump.c:
  Remove unnecessary pthread_yield calls for NetWare
include/my_pthread.h:
  Special extern my_pthread_cond_timedwait no longer required for NetWare
mysql-test/t/backup.test:
  replace_result added so test passes correctly on NetWare
mysys/default.c:
  Add conditional to avoid non-applicable file checking on NetWare
mysys/my_init.c:
  Remove working directory change from netware_init()
mysys/my_pthread.c:
  Remove unnecessary NetWare version of my_pthread_cond_timedwait
mysys/thr_mutex.c:
  Remove unnecessary NetWare block
scripts/make_binary_distribution.sh:
  Changes to clear up extraneous EXTRA_BIN_FILES, NetWare sections
2003-03-21 16:45:39 -05:00
0f18ab7897 Missed one file from Novell changes in 1.1686
netware/mysqld_safe.c:
  Changes to argument handling, spawn, etc
2003-03-21 16:14:52 -05:00
0ea383e048 Changes from Novell for various NetWare-only files, post-4.0.12
include/config-netware.h:
  Define USE_OLD_FUNCTIONS, remove NKS header includes
netware/BUILD/mwenv:
  Changes to compiler flags
netware/BUILD/nwbootstrap:
  bk changes syntax
netware/Makefile.am:
  Remove isamchk.def, mysqld.xdc, add comp_err.def to netware_build_files
netware/isamchk.def:
  Add XDCDATA
netware/isamlog.def:
  Add XDCDATA
netware/libmysql.def:
  Add XDCDATA
netware/my_manage.c:
  Changes in argument handling, use procve
netware/my_manage.h:
  Changes to argument handling, spawn
netware/my_print_defaults.def:
  Add XDCDATA
netware/myisamchk.def:
  Add XDCDATA
netware/myisamlog.def:
  Add XDCDATA
netware/myisampack.def:
  Add XDCDATA
netware/mysql.def:
  Add XDCDATA
netware/mysql_install.def:
  Add XDCDATA
netware/mysql_install_db.c:
  Argument handling changes, etc
netware/mysql_install_db.def:
  Add XDCDATA
netware/mysql_test_run.c:
  Argument handling, spawn changes, etc
netware/mysql_test_run.def:
  Add XDCDATA
netware/mysqladmin.def:
  Add XDCDATA
netware/mysqlbinlog.def:
  Add XDCDATA
netware/mysqlcheck.def:
  Add XDCDATA
netware/mysqld.def:
  Add XDCDATA
netware/mysqld_safe.def:
  Add XDCDATA
netware/mysqldump.def:
  Add XDCDATA
netware/mysqlimport.def:
  Add XDCDATA
netware/mysqlshow.def:
  Add XDCDATA
netware/mysqltest.def:
  Add XDCDATA
netware/pack_isam.def:
  Add XDCDATA
netware/perror.def:
  Add XDCDATA
netware/replace.def:
  Add XDCDATA
netware/resolveip.def:
  Add XDCDATA
2003-03-21 15:43:38 -05:00
8b71664441 crash-me.sh:
add foreign key value update test


sql-bench/crash-me.sh:
  add foreign key value update test
2003-03-21 21:42:51 +05:00
8b9d8b2966 Fixed a bug in comment handling. 2003-03-21 14:14:36 +02:00
6665ead9ba Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/work-qcfile-4.0


sql/sql_yacc.yy:
  Auto merged
2003-03-21 10:03:43 +02:00