Commit graph

13788 commits

Author SHA1 Message Date
unknown
4e9bb7a9a9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-root
2004-08-18 02:16:43 +04:00
unknown
ead6df77e2 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-17 17:34:58 +02:00
unknown
70f0a36dbd Fix for BUG#5038 "Cannot disable LOAD DATA LOCAL INFILE from client"
(specific to 4.1): don't put CLIENT_LOCAL_FILES in
CLIENT_CAPABILITIES; it would make mysql_options(CLIENT_LOCAL_FILES,0)
have no effect.


libmysql/client_settings.h:
  Don't enforce that we client have CLIENT_LOCAL_FILES;
  indeed this CLIENT_CAPABILITIES is used as minimum
  client options in mysql_real_connect(), which is *after*
  mysql_options(). Having CLIENT_LOCAL_FILES in
  CLIENT_CAPABILITIES defeats disabling it in mysql_options().
2004-08-17 17:33:21 +02:00
unknown
21a264cc4c Removed non-used variable
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-17 12:20:01 -03:00
unknown
4e50936206 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/mysql/4.1
2004-08-17 01:34:17 -07:00
unknown
ff24b4d5d4 Fix for not compiling ha_tina.
sql/examples/ha_tina.cc:
  Adding in pieces to remove from compile (aka ifdef).
2004-08-17 01:29:19 -07:00
unknown
4daee7380f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-hpux
2004-08-17 12:06:03 +04:00
unknown
62c3acac18 Portablity fix.
hpux11 compiler dislikes empty array initializers.
2004-08-17 12:05:34 +04:00
unknown
5a7dd14edf Fix for bug#4488: sign-aware equality check
mysql-test/r/range.result:
  Fix for bug#4488: more tests
mysql-test/t/range.test:
  Fix for bug#4488: more tests
2004-08-17 02:59:24 +04:00
unknown
dc11a82e33 Updated of test cases for CSV engine.
mysql-test/r/ps_1general.result:
  Updated test results for addition of CSV engine.
2004-08-16 14:19:50 -07:00
unknown
a7a508e14f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-16 17:01:36 +02:00
unknown
a15233457a Fix for BUG#5064 "SET GLOBAL SYNC_BINLOG does not work on some platforms":
var->save_result.ulong_value was 0 on Mac OS X probably due to positions
of members in the union. sys_var::check() only sets ulonglong_value


sql/set_var.cc:
  Of the save_result union, sys_var::check() only updates ulonglong_value;
  so other types of the union are garbage. Here we must use ulonglong_value
  in sys_var_sync_binlog_period::update(), not ulong_value (which is )
2004-08-16 17:00:48 +02:00
unknown
952f456e83 ctype_utf8.test:
Bug#4521: unique prefix keys, fix for HEAP HASH and HEAP BTREE case insensitive collations.


mysql-test/t/ctype_utf8.test:
  Bug#4521: unique prefix keys, fix for HEAP HASH and HEAP BTREE case insensitive collations.
2004-08-16 19:58:50 +05:00
unknown
a5f1fea039 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
2004-08-16 13:07:50 +02:00
unknown
4c1f172193 Updated server-cfg, remove limitation for blobs + NDB
sql-bench/server-cfg.sh:
  Remove the limitation for NDB+blobs
2004-08-16 13:06:32 +02:00
unknown
e65e823c48 Merge mysql.com:/home/jonas/src/ll
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-15 21:45:00 +02:00
unknown
dc276ef72e Fix AC_DEFINE for CSV storage engine 2004-08-15 21:44:09 +02:00
unknown
f755cf9e08 1) Removed to hard require
2) Fix variable scope for irix compiler


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Remove part of require
ndb/test/src/NDBT_Tables.cpp:
  old compiler fix
2004-08-15 21:15:40 +02:00
unknown
d9e3b38ffd Minor bugs
ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Init page state
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Init usr pointer for tcseize/releasereq
ndb/test/src/NDBT_Tables.cpp:
  More error printouts
2004-08-15 20:44:41 +02:00
unknown
20160a1084 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-15 18:58:02 +02:00
unknown
d68c334cf0 Bug#4970 2004-08-15 14:26:08 +02:00
unknown
24e03b49a2 Adding test cases for the example storage engine (so that you can test to see if it was built correctly). 2004-08-13 17:14:36 -07:00
unknown
2d8f4a61bf Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/tina-4.1


acinclude.m4:
  Auto merged
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Auto merged
configure.in:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-08-13 16:27:17 -07:00
unknown
ff5ade15bd Merge resolve. Changed name of ha_example to ha_example_engine.
sql/set_var.cc:
  Changed have_example to have_example_engine (easier to understand when reading output). Also resolved merge problem.
2004-08-13 16:24:46 -07:00
unknown
a5a4ed90f5 Merge
myisam/mi_key.c:
  SCCS merged
2004-08-13 18:31:30 +02:00
unknown
b6f6d5b2fd apply UNIQUE constrain correctly for multi-byte charsets
only MyISAM is fixed


include/m_ctype.h:
  my_charpos() macro
myisam/mi_key.c:
  apply UNIQUE constrain correctly for multi-byte charsets
mysql-test/r/binary.result:
  new test
mysql-test/r/key.result:
  apply UNIQUE constrain correctly for multi-byte charsets
mysql-test/t/binary.test:
  new test
mysql-test/t/func_gconcat.test:
  make test to pass w/o InnoDB
mysql-test/t/key.test:
  apply UNIQUE constrain correctly for multi-byte charsets
2004-08-13 18:29:25 +02:00
unknown
c9c7834164 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
2004-08-13 17:11:52 +02:00
unknown
d528d8c454 Fix apiConnectptr after execute direct 2004-08-13 17:10:08 +02:00
unknown
cd8898460a Dump core if VM_TRACE || ERROR_INSERT 2004-08-13 16:41:06 +02:00
unknown
a10db839cb Fix type for 4115 2004-08-13 16:37:19 +02:00
unknown
7b68640505 Bug fix for error insert 5038,
timeout in abort handling with more than 128 operations
2004-08-13 16:33:55 +02:00
unknown
cb6a3b222d New error codes + automatic nulling of tvariables
ndb/src/kernel/blocks/ERROR_codes.txt:
  New error codes for LQH
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Automatic nulling of tvariables
2004-08-13 16:11:00 +02:00
unknown
467f5956eb CSC issue # 3299 fix:
ENUM and SET type didn't compute their length correctly.
That showed up for example while converting into a CHAR column.
2004-08-13 19:06:24 +05:00
unknown
eddc4fdeb5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-13 14:34:51 +02:00
unknown
b8c73f8100 Removed unused error code 2004-08-13 14:33:59 +02:00
unknown
55cc6be43c Added support for NULL in unique index 2004-08-13 13:51:18 +02:00
unknown
e2cfe7b607 ctype_utf8.result, ctype_utf8.test, item_strfunc.cc:
LEFT() didn't work well in some cases.


sql/item_strfunc.cc:
  LEFT() didn't work well in some cases.
mysql-test/t/ctype_utf8.test:
  LEFT() didn't work well in some cases.
mysql-test/r/ctype_utf8.result:
  LEFT() didn't work well in some cases.
2004-08-13 15:04:10 +05:00
unknown
bf8cfd40e0 Introduced system for automatic clearing of block global variables (VM_TRACE'd)
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Introduced automatic clearing of block global variables
ndb/src/kernel/vm/SimulatedBlock.hpp:
  Introduced automatic clearing of block global variables
2004-08-13 09:53:21 +02:00
unknown
da60f1973d ctype_utf8.result, ctype_utf8.test, mi_key.c:
bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.


myisam/mi_key.c:
  bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
mysql-test/t/ctype_utf8.test:
  bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
mysql-test/r/ctype_utf8.result:
  bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
2004-08-13 12:32:27 +05:00
unknown
16987e1ce2 ctype_ucs.result, ctype_ucs.test, item.cc:
#5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings


sql/item.cc:
  #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
mysql-test/t/ctype_ucs.test:
  #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
mysql-test/r/ctype_ucs.result:
  #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
2004-08-13 11:13:56 +05:00
unknown
89987fa104 This is the addition of the CSV engine "aka tina". Its an example engine that works as a plain text file.
acconfig.h:
  Adding HAVE CSV rule
acinclude.m4:
  Build option of csv engine
configure.in:
  Update for building CSV
sql/Makefile.am:
  Added files for CSV build
sql/handler.cc:
  Needed options for CSV to be created.
sql/handler.h:
  CSV type engine enum.
sql/mysql_priv.h:
  Addition of the have_csv_db variable.
sql/mysqld.cc:
  Code to show csv option.
sql/set_var.cc:
  Adding have show variables for both csv and example.
2004-08-12 20:57:18 -07:00
unknown
fe61e5d2e4 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-12 20:31:00 +02:00
unknown
4a0f586bc7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-08-12 20:43:14 +05:00
unknown
6473366f2a #4521: unique key prefix interacts poorly with utf8
Fix for MyISAM with prefix compressed keys.
2004-08-12 20:39:24 +05:00
unknown
a953bb4b70 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-08-12 15:34:29 +03:00
unknown
fe19bd924d Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-12 13:13:22 +02:00
unknown
f6e5d6ce9d Fix for BUG#4678 "mysql-test-run fails on grant_cache":
do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root')
(such behaviour is a feature of mysql_real_connect(), see the manual).


mysql-test/t/grant_cache.test:
  do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root').
sql/slave.cc:
  a comment
2004-08-12 13:12:09 +02:00
unknown
8428c5e535 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-08-12 12:42:13 +02:00
unknown
fedc787e53 Reenable diskless for faster mysql-test-run 2004-08-12 12:40:35 +02:00
unknown
7f109dbfdc Added more ndb binaries to ignore
BitKeeper/etc/ignore:
  added ndb/test/ndbapi/create_all_tabs ndb/test/ndbapi/create_tab ndb/test/ndbapi/drop_all_tabs ndb/test/ndbapi/flexAsynch ndb/test/ndbapi/flexBench ndb/test/ndbapi/flexHammer ndb/test/ndbapi/flexTT ndb/test/ndbapi/testBackup ndb/test/ndbapi/testBasic ndb/test/ndbapi/testBasicAsynch ndb/test/ndbapi/testBlobs ndb/test/ndbapi/testDataBuffers ndb/test/ndbapi/testDeadlock ndb/test/ndbapi/testDict ndb/test/ndbapi/testIndex ndb/test/ndbapi/testMgm ndb/test/ndbapi/testNdbApi ndb/test/ndbapi/testNodeRestart ndb/test/ndbapi/testOIBasic ndb/test/ndbapi/testOperations ndb/test/ndbapi/testRestartGci ndb/test/ndbapi/testScan ndb/test/ndbapi/testScanInterpreter ndb/test/ndbapi/testScanPerf ndb/test/ndbapi/testSystemRestart ndb/test/ndbapi/testTimeout ndb/test/ndbapi/testTransactions ndb/test/ndbapi/test_event ndb/test/ndbapi/bank/bankCreator ndb/test/ndbapi/bank/bankMakeGL ndb/test/ndbapi/bank/bankSumAccounts ndb/test/ndbapi/bank/bankTimer ndb/test/ndbapi/bank/bankTransactionMaker ndb/test/ndbapi/bank/bankValidateAllGLs
   ndb/test/ndbapi/bank/testBank ndb/test/run-test/atrt ndb/test/tools/copy_tab ndb/test/tools/create_index ndb/test/tools/hugoCalculator ndb/test/tools/hugoFill ndb/test/tools/hugoLoad ndb/test/tools/hugoLockRecords ndb/test/tools/hugoPkDelete ndb/test/tools/hugoPkRead ndb/test/tools/hugoPkReadRecord ndb/test/tools/hugoPkUpdate ndb/test/tools/hugoScanRead ndb/test/tools/hugoScanUpdate ndb/test/tools/ndb_cpcc ndb/test/tools/restart ndb/test/tools/verify_index
2004-08-12 12:37:16 +02:00