mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-25 00:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16276 commits 2774 branches 343 tags 1.6 GiB
Commit graph

16276 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
45643bc6aa Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2004-12-08 19:35:04 +01:00
unknown
b5e844468c - added two new options to Do-compile: 
--ps-test: run the test suite using prepared statements
  --embedded-test: run the test suite against the embedded server


Build-tools/Do-compile:
  - added two new options:
    --ps-test: run the test suite using prepared statements
    --embedded-test: run the test suite against the embedded server
 2004-12-08 19:34:11 +01:00
unknown
14eacb86bf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
 2004-12-08 17:24:55 +00:00
unknown
433430f4a2 os0file.c: 
Print a better error message to the .err log if InnoDB's advisory file locking fails


innobase/os/os0file.c:
  Print a better error message to the .err log if InnoDB's advisory file locking fails
 2004-12-08 17:53:01 +02:00
unknown
75b5e9d39f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
 2004-12-08 14:25:36 +00:00
unknown
b89ef30962 bug #7104 
+ some extra debug printouts


mysql-test/ndb/ndbcluster.sh:
  fixed debug flag in ndbcluster start script
ndb/include/debugger/EventLogger.hpp:
  bug #7104
ndb/include/kernel/LogLevel.hpp:
  bug #7104
ndb/src/common/debugger/EventLogger.cpp:
  bug #7104
ndb/src/common/portlib/NdbTCP.cpp:
  removed debug printout in Ndb_getInAddr
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  bug #7104
ndb/src/mgmapi/mgmapi.cpp:
  bug #7104
ndb/src/mgmsrv/MgmtSrvr.cpp:
  bug #7104
ndb/src/mgmsrv/MgmtSrvr.hpp:
  bug #7104
ndb/src/mgmsrv/Services.cpp:
  bug #7104
ndb/src/ndbapi/TransporterFacade.cpp:
  bug #7104
 2004-12-08 14:24:59 +00:00
unknown
875cdfe3c9 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb-pristine


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
 2004-12-08 11:11:20 +11:00
unknown
c23f644420 A followup to Bug#6878 "Crash with engine=memory", reported as Bug#6986 
""show_check" fails on 64bit platforms": now minimal rec_length
of a HEAP table >= sizeof(void*), hence it's platform-dependant.


mysql-test/r/show_check.result:
  Fix test results for 64-bit platforms.
mysql-test/t/show_check.test:
  Ignore two more columns of output of show table status: it's different
  on 64-bit and 32-bit platforms.
 2004-12-08 01:34:50 +03:00
unknown
f8c1d3fae4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-12-07 21:43:12 +01:00
unknown
27c6192e82 allocate a buffer large enough for a longer matching string 2004-12-07 21:41:29 +01:00
unknown
f3ab62a182 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


sql/sql_parse.cc:
  Auto merged
 2004-12-07 21:58:26 +02:00
unknown
d74a3faf24 Fixed Bug#7043, "SHOW CREATE TABLE security hole". 2004-12-07 21:57:54 +02:00
unknown
86f19614e1 postreview fix 
sql/item_cmpfunc.cc:
  comment fixed
sql/item_subselect.cc:
  comment fixed
  debug info and inherited method call
sql/item_subselect.h:
  comment fixed
sql/item_sum.cc:
  comment fixed
sql/item_sum.h:
  comment fixed
 2004-12-07 21:18:15 +02:00
unknown
d91953fa90 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
 2004-12-07 19:32:16 +02:00
unknown
ac96a2bbcb Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-12-07 19:16:00 +02:00
unknown
5c7949af6b Fix for a bug #6996 
BitKeeper/etc/ignore:
  Added analyse.test client/mysqladmin.c to the ignore list
libmysql/libmysql.c:
  Fix for a bug #6996
  
  This fix enables that after all rows are read from a buffered result,
  mysql_stmt_data_seek(stmt,0) can rewind a counter to the beginning,
  so that rows can be re-fetched.
tests/client_test.c:
  Addition of a test for fix of the bug #6996 in client_test.c
 2004-12-07 19:12:29 +02:00
unknown
14cf21c434 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-12-07 17:11:32 +01:00
unknown
9806e3f057 Added missing ; 2004-12-07 17:10:42 +01:00
unknown
189f1938ff Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6993
 2004-12-07 19:39:47 +04:00
unknown
96d6a11631 added returntype BaseString& for ndb_upper and ndb_lower instead of void 
uppercase printout


ndb/include/util/BaseString.hpp:
  added returntype BaseString& for ndb_upper and ndb_lower instead of void
ndb/src/mgmclient/CommandInterpreter.cpp:
  uppercase printout
 2004-12-07 15:39:46 +00:00
unknown
835afc54ec Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
 2004-12-07 15:23:31 +00:00
unknown
51e8c4add2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6993
 2004-12-07 18:25:12 +04:00
unknown
c68dfe29fb #7066 [Ver]: "ctype_ucs" fails on SGI IRIX 2004-12-07 17:01:46 +04:00
unknown
8c7f711404 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
 2004-12-07 14:18:14 +02:00
unknown
301582c189 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
 2004-12-07 15:18:13 +03:00
unknown
31099d116b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6077
 2004-12-07 15:14:28 +03:00
unknown
d23c70e9cf merge fix 2004-12-07 15:13:47 +03:00
unknown
9f48eedb4e Fix for bug #6840: Default value is not checked in ALTER column SET DEFAULT 'x' 2004-12-07 14:08:56 +03:00
unknown
abaeea4993 merge 
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/t/key_cache.test:
  Auto merged
sql/field.cc:
  Auto merged
 2004-12-07 13:56:48 +03:00
unknown
154e64ac92 A fix (bug #6993: Max myisam_data_pointer_size limited to 7). 2004-12-07 14:51:13 +04:00
unknown
568aa832a2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-12-07 10:31:55 +01:00
unknown
a700754e71 Removed getTableForAlteration 2004-12-07 10:27:22 +01:00
unknown
19eaf7cb34 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
 2004-12-07 09:12:34 +00:00
unknown
065a07289c fixed clusterlog "filter" command 
ndb/src/mgmsrv/CommandInterpreter.cpp:
  removed clusterlog command
ndb/src/mgmsrv/CommandInterpreter.hpp:
  removed clusterlog command
 2004-12-07 09:11:50 +00:00
unknown
6c68f27cc4 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.6755
 2004-12-07 11:20:11 +04:00
unknown
b9d9c31430 merge 
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
 2004-12-07 09:07:37 +02:00
unknown
d5c7d85001 Fix segmentation fault on incorrect configuration. 
Starting ndb_mgmd on a host which isn't in the configuration file as the ndb_mgmd 
(e.g. the ip address is different) would have ndb_mgmd segfault.

There was a check in the code, but it was (potentially) trying to dereference null


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Don't try and print client_addr->sin_addr if client_addr is null
 2004-12-07 15:49:54 +11:00
unknown
e1248f4fc3 Fix for crummy compiler that didn't udnerstand for declaration. Another fix for example storage engine to pass, not skip, test. 
mysql-test/r/have_exampledb.require:
  Fix for test for examples.
sql/examples/ha_archive.cc:
  Fix for compiler that had problem with ANSI C.
 2004-12-06 16:26:05 -08:00
unknown
e2d4dc23c4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-12-06 22:58:15 +01:00
unknown
8ec6cf2cd5 UCS2 support in ENUM and SET, which also fixes: 
Bug #5174 SHOW CREATE TABLE hangs up if the table contains half-with katakana enum values
UCS2 values are stored in HEX encoding in FRM file
 2004-12-06 20:45:32 +04:00
unknown
678fff408a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5823


sql/sql_parse.cc:
  Auto merged
 2004-12-06 20:45:31 +04:00
unknown
0d8d061f73 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
 2004-12-06 19:45:30 +03:00
unknown
45fc838439 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
 2004-12-06 19:03:39 +03:00
unknown
e94fc374c5 Syntax extention: 'ALTER DATABASE' without db name (after review) 2004-12-06 19:01:51 +03:00
unknown
1f1257bd52 A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet). 
scripts/fill_help_tables.sh:
  percent_xxx variables added to avoid /0 error.
scripts/mysql_install_db.sh:
  A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet).          
  --net_buffer_length=16K added.
sql/net_serv.cc:
  Typo fixed.
sql/sql_parse.cc:
  A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet).
  Auto extend net buffer in bootstrap mode.
 2004-12-06 18:45:41 +04:00
unknown
6e4a848dcc Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-12-06 14:57:29 +01:00
unknown
15c0d3373b Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-12-06 14:51:38 +01:00
unknown
df1faeb48c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into build.mysql.com:/users/rburnett/mysql-4.1-new2
 2004-12-06 14:51:37 +01:00
unknown
c6b3c442a5 Fix for bug#6935 table rename does not work with ndb tables 2004-12-06 14:51:10 +01:00
unknown
04866cf0f1 New fix for bug#6796 Wrong outcome of update operation of ndb table 2004-12-06 14:34:02 +01:00