mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
14330 commits 2788 branches 343 tags 1.7 GiB
Commit graph

14330 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
069c47d260 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb


acinclude.m4:
  Auto merged
configure.in:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
 2004-09-01 04:55:16 +02:00
unknown
15135482ad Fix bug in trans counter for read 2004-09-01 04:50:17 +02:00
unknown
22f3bcdec7 Also update printer 2004-08-31 22:17:58 +02:00
unknown
540c90e407 Added some more options to TC timers, such as: 
1) explicit start/stop timer (instead of perodical reports)
2) scan & range scan reporting
 2004-08-31 22:12:08 +02:00
unknown
db210b0919 bug#4591 
ndb/src/mgmsrv/MgmtSrvr.cpp:
  bug#4591
  Wait for not started instead of (! no contact)
 2004-08-31 21:34:11 +02:00
unknown
f34a7ff423 run in loop 2004-08-31 16:27:31 +02:00
unknown
775c057ef4 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-31 15:53:28 +02:00
unknown
e9c594e6d4 Better easier to call error message format. 2004-08-31 18:53:27 +05:00
unknown
d6493dbefe - bumped up version number in configure.in to "4.1.5-gamma" 
- tagged ChangeSet@1.2013 as "mysql-4.1.4"


configure.in:
   - bumped up version number in configure.in to "4.1.5-gamma"
 2004-08-31 15:53:26 +02:00
unknown
52df5f5b5a Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


cmd-line-utils/libedit/Makefile.am:
  Auto merged
configure.in:
  Auto merged
 2004-08-31 18:53:24 +05:00
unknown
8bf3885883 fixed two compiling bugs for libedit 
acinclude.m4:
  added macro to check if dirent.d_namlen is defined
cmd-line-utils/libedit/config.h:
  added define for __attribute__
cmd-line-utils/libedit/readline.c:
  checked STRUCT_DIRENT_HAS_D_NAMLEN instead of
  old enumeration of problem platforms
configure.in:
  added checking if dirent has d_namlen member field
 2004-08-31 18:29:01 +05:00
unknown
042d620948 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-31 15:00:50 +02:00
unknown
54c1dc12f8 Update test prg 
1) merge join
2) lookups
 2004-08-31 14:53:59 +02:00
unknown
51fce2d247 fixed compiling bug of libedit on qnx 
discarded using of uint in cmd-line-utils/libedit/chared.c
because it's undefined on qnx


cmd-line-utils/libedit/chared.c:
  discarded using of uint because it's undefined on qnx
 2004-08-31 17:51:02 +05:00
unknown
7728843c66 fixed compiling bug 
(non gcc compilers don't understand '-Dx()=' option)


cmd-line-utils/libedit/Makefile.am:
  discarded '-Dx()=' options for compatibility with non-gcc compilers
cmd-line-utils/libedit/config.h:
  added empty definitions of __RCSID(x), __COPYRIGHT(x), 
                            __RENAME(x), _DIAGASSERT(x)
cmd-line-utils/libedit/np/unvis.c:
  added #include "config.h" to define __RCSID(x)
cmd-line-utils/libedit/np/vis.c:
  reinsert #include "config.h" before using of __RCSID(x)
 2004-08-31 17:29:47 +05:00
unknown
d2baf0f12b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames


sql/sql_class.cc:
  Auto merged
 2004-08-31 14:12:42 +04:00
unknown
851e3cabb0 Fix for bug#5312 Ndb Cluster returns wrong error code for duplicate key at insert 2004-08-31 12:07:48 +02:00
unknown
c62dd0d409 Change Item_arena::state to enum 2004-08-31 14:07:02 +04:00
unknown
e9a85134c7 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-31 10:20:51 +02:00
unknown
c52a30b5df Enabled HA_NULL_IN_KEY support 2004-08-31 10:19:10 +02:00
unknown
2bad0cee50 Interpreter fix + tets prg 
ndb/src/ndbapi/NdbOperationInt.cpp:
  Fix so that interpreter is possible together with index scans
ndb/test/ndbapi/Makefile.am:
  New test prog
 2004-08-31 10:14:36 +02:00
unknown
2e86cdb179 Simplified expensive test 2004-08-31 10:00:33 +02:00
unknown
e2f697bec0 Names listed as options should look like options, 
not variables.
 2004-08-30 11:11:10 -05:00
unknown
6bc2acce00 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/mysqld.cc:
  Auto merged
 2004-08-30 16:32:10 +02:00
unknown
7982187476 space-stripping in _mi_prefix_search: BUG#5284 2004-08-30 16:12:53 +02:00
unknown
9ed92fea50 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/space/pekka/ndb/version/my41-tux


ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
 2004-08-30 15:31:30 +02:00
unknown
5bafde9ab0 Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES". 
configure.in:
  Defining "BIG_TABLES" works around a problem with the Sun Forte 
  compiler for Solaris on x86 platforms: improper handling of "long long".
  Error shows up on the "limit_rows_found" variable in test "union".
  Old "BIG_FILES" was a typing error.
 2004-08-30 13:25:22 +02:00
unknown
89dd83db35 ndb table locks 
Removed errornous hupp, which made handler commit same transid several times
(which is checked when running in debug mode)


sql/ha_ndbcluster.cc:
  Removed errornous hupp, which made handler commit same transid several times
  (which is checked when running in debug mode)
 2004-08-30 12:13:10 +02:00
unknown
42a7e96adb see resp. file 
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  adder error insert for error during shutdown
ndb/src/kernel/error/ErrorHandlingMacros.hpp:
  seeror set method for signal handler
ndb/src/kernel/main.cpp:
  adder error insert for error during shutdown
ndb/src/kernel/vm/Emulator.cpp:
  adder error insert for error during shutdown
  + check for error handler invoked by signal handler
ndb/src/kernel/vm/Emulator.hpp:
  enum so signal that Shatdown is invoked by signal handler
 2004-08-30 10:13:09 +00:00
unknown
7776439c7b fixed so that error handler is only invoked once 2004-08-30 08:25:17 +00:00
unknown
4059385219 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
 2004-08-30 08:08:36 +00:00
unknown
d8f416a26c bug in my_strnncoll_utf8 (and friends) fixed 
cleanups
better, charset-dependent, ft_max_len_for_sort value


myisam/ftdefs.h:
  better ft_max_len_for_sort value
myisam/mi_check.c:
  better, charset-dependent, ft_max_len_for_sort value
myisam/myisamchk.c:
  unused value from enum removed
myisam/sort.c:
  cleanup
sql/mysql_priv.h:
  cleanup
sql/mysqld.cc:
  cleanup
sql/sql_acl.cc:
  cleanup
sql/tztime.cc:
  cleanup
strings/ctype-utf8.c:
  bug in my_strnncoll_utf8 (and friends) fixed
 2004-08-30 08:37:36 +02:00
unknown
52581fb604 configure.in: 
Ascii was written twice


configure.in:
  Ascii was written twice
 2004-08-30 11:36:26 +05:00
unknown
02d3c02281 Fix for BUG#5242: Made SQL Syntax Prepared Statement names case-insensitive. 
mysql-test/r/ps.result:
  Testcase for BUG#5242
mysql-test/t/ps.test:
  Testcase for BUG#5242
 2004-08-29 19:44:28 +04:00
unknown
ebf4ce0501 Minor edits to error messsage. 2004-08-28 13:07:47 -05:00
unknown
8165b519e2 - adding more missing libedit files 2004-08-27 22:52:33 +02:00
unknown
f0239303b9 - add missing file "read.h" to the source distribution 2004-08-27 21:18:51 +02:00
unknown
d02da1d978 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-27 19:42:04 +02:00
unknown
43acfcae1f Better handling of transaction ids, 
make *sure* that no one gets same transid twice
(wo/ restarting process)
 2004-08-27 19:41:00 +02:00
unknown
3f45e53790 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-27 19:36:54 +02:00
unknown
00a11f790a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 19:35:24 +02:00
unknown
ff136de460 Handle drop ordered index with table id > pool size 2004-08-27 19:33:46 +02:00
unknown
f1825699fa mysql.cc: 
Minor edits to help command messages.


client/mysql.cc:
  Minor edits to help command messages.
 2004-08-27 12:27:57 -05:00
unknown
6eac99a5b6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 19:02:46 +02:00
unknown
d393ff72b6 Bu#4526 building with utf8_bin collation causes help to be case sensitive 2004-08-27 21:12:53 +05:00
unknown
353fb4c8d4 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/Users/mikron/mysql-4.1-ndb
 2004-08-27 18:04:12 +02:00
unknown
f71662695d Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION conflict 2004-08-27 20:48:19 +05:00
unknown
3d2e2ddd12 grant.result: 
Forgot to push in the previous changeset


mysql-test/r/grant.result:
  Forgot to push in the previous changeset
 2004-08-27 20:48:18 +05:00
unknown
7f8e7315b3 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-08-27 17:48:17 +02:00
unknown
12e10b11d9 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
 2004-08-27 20:48:16 +05:00