mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16738 commits 2793 branches 343 tags 1.5 GiB
Commit graph

16738 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com
81363b194d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-11-09 00:22:26 +02:00
guilhem@mysql.com
0517e7b22d As rollback can be 30 times slower than insert in InnoDB, and user may 
not know there's rollback (if it's because of a dupl row), better warn
that it's happening. It can also be of use for a DBA killing a
connection and wondering what this connection is still doing now. Example:
|  5 | root | localhost | test | Killed  | 10   | Rolling back | insert into i select * from j |
 2004-11-08 21:45:23 +01:00
bar@mysql.com
a83f8e60ab mysql.h: 
Adding a prototype for the new function.
 2004-11-09 00:19:39 +04:00
monty@mysql.com
1087186657 Merge with 4.1 to get new thd->mem_root handling 2004-11-08 17:53:32 +02:00
monty@mysql.com
401ede54b7 Fixed typo 2004-11-08 16:36:25 +02:00
tomas@poseidon.ndb.mysql.com
9b7ea44b26 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-08 14:07:37 +00:00
tomas@poseidon.ndb.mysql.com
17de85dfa6 added ndb test platform test 2004-11-08 13:33:10 +00:00
serg@sergbook.mylan
0fc671a43d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-11-08 14:16:38 +01:00
joreland@mysql.com
ffaa063659 compile fix for ndbapi test program on irix (variable scope) 2004-11-08 13:59:04 +01:00
jan@hundin.mysql.fi
a3f4bd28ac Fixed a bug in UPDATE statement with no index column in where condition 
locks all rows (BUG #3300). When using innobase_locks_unsafe_for_binlog
option InnoDB does not take locks for those rows which do not
belong to the result set or werent changed by the query. This fix removes
unnecessary locks also from SELECT and DELETE queries.
 2004-11-08 14:52:15 +02:00
lars@mysql.com
3e3cac142e Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b6239-4.1-v2-pending
 2004-11-08 13:45:42 +01:00
joreland@mysql.com
98e6ddfe4a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-08 12:45:31 +01:00
tomas@poseidon.ndb.mysql.com
83581c369f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-08 11:29:45 +00:00
tomas@poseidon.ndb.mysql.com
eea1b83b20 Makefile.am: 
fix to make make -jN work
 2004-11-08 11:28:57 +00:00
joreland@mysql.com
04c8621390 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-08 11:53:50 +01:00
bar@mysql.com
a11dba7bab Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-11-08 14:53:49 +04:00
tomas@poseidon.ndb.mysql.com
3f38389905 Makefile.am: 
added so that it is possible to make mysql_test_run_new
  but not done for target all do:
   make mysql_test_run_new
 2004-11-08 10:53:48 +00:00
tomas@poseidon.ndb.mysql.com
f3cd21dbb3 Makefile.am: 
remove mysql_test_run_new for now, it breaks the make
 2004-11-08 10:41:59 +00:00
tomas@poseidon.ndb.mysql.com
f5b373d678 Makefile.am: 
changed make order
.del-Makefile_old~dde91b00b37d2a06:
  Delete: ndb/tools/Makefile_old
.del-Makefile_old~70d769657921a760:
  Delete: ndb/test/tools/Makefile_old
.del-Makefile_old~58f0559822147dd9:
  Delete: ndb/test/tools/old_dirs/waiter/Makefile_old
.del-Makefile_old~4fdb3c92ebd2eb29:
  Delete: ndb/test/run-test/Makefile_old
.del-Makefile_old~1497f81a0c2125e:
  Delete: ndb/test/src/Makefile_old
.del-Makefile_old~fbd3934fabdfe550:
  Delete: ndb/test/ndbapi/Makefile_old
.del-Makefile_old~ec8e48326d4aa09:
  Delete: ndb/test/ndbapi/old_dirs/flexBench/Makefile_old
.del-Makefile_old~1046c9ce93ef1fb8:
  Delete: ndb/test/ndbapi/bank/Makefile_old
.del-Makefile_old~7c98d8f1d275983f:
  Delete: ndb/src/ndbapi/Makefile_old
.del-Makefile_old~4463cf06fc2fceb9:
  Delete: ndb/src/mgmapi/Makefile_old
.del-Makefile_old~274925c960801993:
  Delete: ndb/src/mgmsrv/Makefile_old
.del-Makefile_old~b3d33fdde8bc12c0:
  Delete: ndb/src/kernel/Makefile_old
.del-Makefile_old~6dbe2defc7237d4d:
  Delete: ndb/src/kernel/vm/Makefile_old
.del-Makefile_old~cf05571c99011360:
  Delete: ndb/src/kernel/error/Makefile_old
.del-Makefile_old~29a955a7e17d650e:
  Delete: ndb/src/kernel/blocks/Makefile_old
.del-Makefile_old~f8b2a47eb434d43:
  Delete: ndb/src/kernel/blocks/suma/Makefile_old
.del-Makefile_old~f0c05bb23d5c23ca:
  Delete: ndb/src/kernel/blocks/grep/Makefile_old
.del-Makefile_old~a6fd2e579249f6e0:
  Delete: ndb/src/kernel/blocks/ndbcntr/Makefile_old
.del-Makefile_old~7e8d8b4e2b1fa8f7:
  Delete: ndb/src/kernel/blocks/ndbfs/Makefile_old
.del-Makefile_old~73c174fc712803c5:
  Delete: ndb/src/kernel/blocks/qmgr/Makefile_old
.del-Makefile_old~16de31311951fc04:
  Delete: ndb/src/kernel/blocks/trix/Makefile_old
.del-Makefile_old~788c80e5e758ac7:
  Delete: ndb/src/kernel/blocks/dbutil/Makefile_old
.del-Makefile_old~5ebf2b4f85ab09cf:
  Delete: ndb/src/kernel/blocks/dbtux/Makefile_old
.del-Makefile_old~530f9e0bc038a62:
  Delete: ndb/src/kernel/blocks/dbtup/Makefile_old
.del-Makefile_old~315b927180484020:
  Delete: ndb/src/kernel/blocks/dbtc/Makefile_old
.del-Makefile_old~d013a228cad86ba0:
  Delete: ndb/src/kernel/blocks/dbacc/Makefile_old
.del-Makefile_old~c2e33f043b8aa45e:
  Delete: ndb/src/kernel/blocks/cmvmi/Makefile_old
.del-Makefile_old~bdf406f5fb4696cb:
  Delete: ndb/src/kernel/blocks/dblqh/Makefile_old
.del-Makefile_old~38a24016d2ad8aa7:
  Delete: ndb/src/kernel/blocks/dbdict/Makefile_old
.del-Makefile_old~2804044250a6fd91:
  Delete: ndb/src/kernel/blocks/dbdih/Makefile_old
.del-Makefile_old~e58eec87cd8dc79e:
  Delete: ndb/src/cw/Makefile_old
.del-Makefile_old~b50c85b8eb69aacb:
  Delete: ndb/src/kernel/blocks/backup/Makefile_old
.del-Makefile_old~16e186623106985e:
  Delete: ndb/src/cw/cpcd/Makefile_old
.del-Makefile_old~f03f74238d640d5:
  Delete: ndb/src/common/mgmcommon/Makefile_old
.del-Makefile_old~a8e9765b520b7c68:
  Delete: ndb/src/common/util/Makefile_old
.del-Makefile_old~9f275aed83c8652b:
  Delete: ndb/src/common/transporter/Makefile_old
.del-Makefile_old~8d901a664eca1ec:
  Delete: ndb/src/common/portlib/Makefile_old
.del-Makefile_old~19643559613c75c7:
  Delete: ndb/src/common/portlib/old_dirs/unix/Makefile_old
.del-Makefile_old~a3f6fc0e1411bb28:
  Delete: ndb/src/common/logger/Makefile_old
.del-Makefile_old~754f27fab7d4da3b:
  Delete: ndb/src/common/debugger/signaldata/Makefile_old
.del-Makefile_old~54ca8df95719e59f:
  Delete: ndb/src/common/debugger/Makefile_old
 2004-11-08 10:35:23 +00:00
tomas@poseidon.ndb.mysql.com
8eeca90b1d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-08 10:30:00 +00:00
joreland@mysql.com
9d8dcdcf72 Merge mysql.com:/home/jonas/src/new-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-08 11:26:34 +01:00
joreland@mysql.com
ddff854b90 Merge mysql.com:/home/jonas/src/kalle 
into mysql.com:/home/jonas/src/new-fix
 2004-11-08 11:24:08 +01:00
bar@mysql.com
ed807c29c9 alter_table.result, alter_table.test, field_conv.cc: 
Bug #6479  ALTER TABLE ... changing charset fails for TEXT columns
  Fix: use do_conv_blob rather than do_copy_blob
  if the column's character sets are different.
 2004-11-08 14:23:14 +04:00
tomas@poseidon.ndb.mysql.com
9f999953a2 removed editline and replaced with mysql readline 
created new facade object for CommandInterpreter
    removed CPC #if 0 code
    removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways
 2004-11-08 10:21:39 +00:00
joreland@mysql.com
3821a8dfca ndb: bug#6435 
fix null handling in ha_ndbcluster when using ordered index
 2004-11-08 11:11:49 +01:00
joreland@mysql.com
8acbd6a2ba ndb: bug#6451 
1) fix so that missing blob tables don't prevent table from being
    dropped
2) decrease size of blob part if record length exceeds max length
3) add test case for table wo/ corresponding blob table
4) init scan counters when sending scan_tabreq
 2004-11-08 11:06:36 +01:00
bar@mysql.com
b7776f83e7 ctype_ujis.result, ctype_ujis.test, field.cc: 
Bug#6345 Unexpected behaviour with partial indices
 2004-11-08 13:15:01 +04:00
serg@sergbook.mylan
342fb28efa decimal.c: 
test_ro("999999999999999999999.999", 0, CEILING);
    test_da("5", "-6.0");
ignore:
  added gdbinit
 2004-11-08 10:06:32 +01:00
bell@sanja.is.com.ua
a41ef77b7b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0
 2004-11-08 03:33:52 +02:00
bell@sanja.is.com.ua
7c80937d27 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-update-5.0
 2004-11-08 01:55:20 +02:00
bell@sanja.is.com.ua
9d0bb7426a postreview fixes 2004-11-08 01:54:23 +02:00
monty@mysql.com
07f9c634ad After merge fixes 2004-11-08 01:51:10 +02:00
monty@mysql.com
4fbf62e6c2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-11-08 01:15:26 +02:00
monty@mysql.com
b903a129e2 Simpler arena swapping code 
Now thd->mem_root is a pointer to thd->main_mem_root and THR_MALLOC is a pointer to thd->mem_root.
This gives us the following benefits:
- Allow us to easily detect if arena has already been swapped before (this fixes a bug in setup_conds() where arena was swaped twice in some cases)
- Faster swaps of arenas (as we don't have to copy the whole MEM_ROOT)
- We don't anymore have to call my_pthread_setspecific_ptr(THR_MALLOC,...) to change where memory is alloced. Now it's enough to set thd->mem_root
 2004-11-08 01:13:54 +02:00
serg@serg.mylan
3d59f12af0 don't return intg=frac=0 from mod 2004-11-07 16:12:21 +01:00
serg@serg.mylan
c9292b8284 memory overrun in decimal_mod 2004-11-07 13:47:44 +01:00
tomas@poseidon.ndb.mysql.com
681b6e9562 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-07 09:43:09 +00:00
tomas@poseidon.ndb.mysql.com
11d7ba905c wrong copyright 2004-11-07 09:42:27 +00:00
kent@mysql.com
f9715d06dc mysql_test_run_new.c: 
Included header fnmatch.h on Unix
  Changed C++ comments to C comments
  Corrected indentation of code written on Windows
  Split up lines to fit into 80 columns
  Initiated some variables to avoid warnings
  Added __attribute__((unused)) to unused function parameters
  Replace tab characters with space
  Put space after 'for', 'while' etc
  Added value to 'return' from non void function removef()
  On Unix strlwr() was incorrectly declared and a no op,
  replaced it with a macro that does nothing
  Split several statements on the same line
  Other minor changes to conform to coding standard
 2004-11-06 14:01:27 +01:00
bell@sanja.is.com.ua
7eae926e26 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0
 2004-11-06 12:46:46 +02:00
brian@avenger.(none)
aaac120d72 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into avenger.(none):/export/brian/mysql/archive-5.0
 2004-11-05 23:17:48 -08:00
brian@avenger.(none)
73addb4de3 Remove build errors introduced by 5.0 changes. 
Removed duplicate code where defaults in handler.h will work just as well.
 2004-11-05 22:49:15 -08:00
igor@rurik.mysql.com
ca355c8a46 join_outer.result, join_outer.test: 
Added cases for bugs #6307 and #6460.
sql_select.cc:
  Fixed the problem of bug reports #6307 and #6460.
  The reported wrong result sets were due to the fact that
  the added call of the fix_fields method for the built
  AND condition that joined WHERE and ON conditions
  broke ON expression, as it removed extra AND levels
  in the built condition. 
  It looks like that no attributes of the built condition
  are needed, so we don't have to call fix_fields here.
 2004-11-05 22:15:24 -08:00
tomas@poseidon.ndb.mysql.com
898541e4b5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-05 23:59:38 +00:00
tomas@poseidon.ndb.mysql.com
362febbf29 removed a bunch of "dead" files from the ndb src tree 2004-11-05 23:59:06 +00:00
jani@a193-229-222-105.elisa-laajakaista.fi
bfdf57ef31 Fixed a typo that caused segmentation fault when using 
--defaults-extra-file option.
 2004-11-05 23:58:30 +02:00
konstantin@mysql.com
97a5fe8e65 Fix the client_test failure (due to failing cursors tests after the merge). 2004-11-05 22:39:19 +03:00
konstantin@mysql.com
fe5889dee5 A fix and test case for Bug#6102 "Server crash with prepared statement 
and blank after function name".
Crop fruits of copy-paste programming: pre-caching of stored functions
wasn't performed for prepared statements just because implementation
of prepared statements is done as an add-on to the main execution flow, 
and the preload was originally implemented for main execution branch
only (mysql_execute_command).
 2004-11-05 22:02:07 +03:00
konstantin@mysql.com
eeeb342b3c A fix and test case for the bug reported by Reggie: if character set 
of client equals to character set of connection, possibly required
conversion to character set of column is not performed
(prepared statements, data is supplied using placeholders).
 2004-11-05 21:02:12 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
862978dde5 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
 2004-11-05 18:59:40 +02:00