mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-13 10:38:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17279 commits 2859 branches 349 tags 1.6 GiB
Commit graph

17279 commits

Author SHA1 Message Date
unknown
9740a87671 Removed need for storage engines to write a default external_lock() call. 
sql/examples/ha_archive.cc:
  Removed external_lock call (no longer needed, we can now use the default).
sql/examples/ha_archive.h:
  No need for an external_lock() call.
sql/handler.h:
  Added default return value for external_lock().
 2004-12-06 00:55:58 -08:00
unknown
bbdb2d28f1 Fix for bugs SHOW PROCEDURE STATUS crashes the server, 
 mysql-nt.exe error when click on sql or database on mysql control center
 2004-12-06 11:55:57 +03:00
unknown
289d3b2ee0 Fix test results 
mysql-test/r/index_merge_ror_cpk.result:
  Portability fix
mysql-test/r/innodb.result:
  Update results
mysql-test/t/index_merge_ror_cpk.test:
  Portability fix
 2004-12-06 01:34:19 +02:00
unknown
623c733895 Fixing problem with case insitive file systems. 
Would you believe that I wrote all of this on a Mac? I just happen to be not using HFS for the partition I did this work on. Oops :)


config/ac-macros/alloca.m4:
  mvdir
config/ac-macros/character_sets.m4:
  mvdir
config/ac-macros/check_cpu.m4:
  mvdir
config/ac-macros/compiler_flag.m4:
  mvdir
config/ac-macros/ha_archive.m4:
  mvdir
config/ac-macros/ha_berkeley.m4:
  mvdir
config/ac-macros/ha_example.m4:
  mvdir
config/ac-macros/ha_innodb.m4:
  mvdir
config/ac-macros/ha_isam.m4:
  mvdir
config/ac-macros/ha_ndbcluster.m4:
  mvdir
config/ac-macros/ha_tina.m4:
  mvdir
config/ac-macros/large_file.m4:
  mvdir
config/ac-macros/misc.m4:
  mvdir
config/ac-macros/mysqlfs.m4:
  mvdir
config/ac-macros/openssl.m4:
  mvdir
config/ac-macros/readline.m4:
  mvdir
config/ac-macros/sanity.m4:
  mvdir
config/ac-macros/zlib.m4:
  mvdir
configure.in:
  Fix silly little problem with case insensitive filesystems.
  
  Funny thing is that I wrote all this on a Mac, but I don't use HFS on that partition so I never noticed that it would be an issue.
  
  Oops :)
 2004-12-04 11:00:33 -08:00
unknown
107ef617ac Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0/ 
into avenger.(none):/export/brian/mysql/acinclude-5.0
 2004-12-03 16:17:24 -08:00
unknown
f09c8b35f4 InnoDB: Fix ctype_utf8 test failure caused by the new record format. 
innobase/btr/btr0btr.c:
  Cache the value of dtype_get_fixed_size(type) in order to avoid
  repeated calls to an external function innobase_is_mb_cset()
innobase/include/data0type.ic:
  Declare innobase_is_mb_cset().
  dtype_get_fixed_size(): Invoke innobase_is_mb_cset() for DATA_MYSQL.
innobase/row/row0ins.c:
  Cache the value of dtype_get_fixed_size(type) in order to avoid
  repeated calls to an external function innobase_is_mb_cset()
innobase/row/row0sel.c:
  row_search_for_mysql(): Added a missing rec_reget_offsets() call
  that caused an InnoDB debug assertion failure in ctype_utf8 test.
sql/ha_innodb.cc:
  Define innobase_is_mb_cset().
 2004-12-03 17:57:44 +02:00
unknown
6865b71c73 strings/decimal.c 
decimal_round(d, -N) bug fixed


strings/decimal.c:
  decimal_round(d, -N) bug fixed
 2004-12-03 13:23:58 +01:00
unknown
89c6cd73e1 strings/decimal.c 
fixed broken d2ll
    added checks for correct test results


strings/decimal.c:
  fixed broken d2ll
  added checks for correct test results
 2004-12-03 13:04:03 +01:00
unknown
ae9992ec6a Resolving conflict. 
configure.in:
  Resolving conflict
 2004-12-02 19:00:33 -08:00
unknown
4fb9a5fbd9 Syntax fix, plus an update for version. 
build/ac-macros/check_cpu.m4:
  Syntax fix
configure.in:
  Updated for version.
 2004-12-02 18:53:49 -08:00
unknown
f88e0d9c07 more decimail bugs fixed 2004-12-03 00:11:30 +01:00
unknown
bdc4fa6eab syntax error fixed 2004-12-03 00:10:12 +01:00
unknown
2d3e0ac72b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2004-12-02 23:04:47 +01:00
unknown
75fa4c00ef Making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish. Normally this step is not long but it's still nice to be killable 
(especially in case of bug like BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever").


sql/lock.cc:
  making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish
sql/mysql_priv.h:
  prototype change
sql/sql_parse.cc:
  now it's possible that make_global_read_lock_block_commit fails (killed)
 2004-12-02 23:02:38 +01:00
unknown
03af7092ec Undoing change for the moment. 
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Delete: acinclude.m4
config.guess:
  Rename: build/config.guess -> config.guess
config.sub:
  Rename: build/config.sub -> config.sub
depcomp:
  Rename: build/depcomp -> depcomp
install-sh:
  Rename: build/install-sh -> install-sh
ltmain.sh:
  Rename: build/ltmain.sh -> ltmain.sh
missing:
  Rename: build/missing -> missing
 2004-12-02 11:39:26 -08:00
unknown
d2c4b54540 Many files: 
Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.


innobase/btr/btr0btr.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/btr/btr0cur.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/btr/btr0pcur.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/btr/btr0sea.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/data/data0data.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/data/data0type.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/dict/dict0boot.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/dict/dict0crea.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/dict/dict0dict.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/dict/dict0load.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/dict/dict0mem.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/fil/fil0fil.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/fsp/fsp0fsp.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/ibuf/ibuf0ibuf.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/btr0btr.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/btr0btr.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/btr0cur.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/btr0cur.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/btr0pcur.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/btr0sea.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/data0type.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/dict0dict.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/dict0dict.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/dict0mem.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/lock0lock.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/lock0lock.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/mtr0log.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/mtr0mtr.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/page0cur.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/page0cur.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/page0page.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/page0page.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/rem0cmp.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/rem0cmp.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/rem0rec.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/rem0rec.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/row0row.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/row0row.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/row0upd.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/row0upd.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/row0vers.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/row0vers.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/srv0srv.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/trx0rec.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/ut0byte.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/ut0byte.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/lock/lock0lock.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/log/log0recv.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/mtr/mtr0log.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/page/page0cur.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/page/page0page.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/pars/pars0pars.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/rem/rem0cmp.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/rem/rem0rec.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0ins.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0mysql.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0purge.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0row.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0sel.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0umod.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0undo.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0upd.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0vers.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/srv/srv0srv.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/trx/trx0rec.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/trx/trx0undo.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
sql/ha_innodb.cc:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
 2004-12-02 19:45:07 +02:00
unknown
4a9ef43a49 trx0xa.h: 
Remove compiler errors from Jan's XA header by commenting the __P macros out


innobase/include/trx0xa.h:
  Remove compiler errors from Jan's XA header by commenting the __P macros out
 2004-12-02 17:40:50 +02:00
unknown
d967118ff6 configure.in: 
Incremented for next version


configure.in:
  Incremented for next version
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-12-02 07:24:08 +01:00
unknown
4b2cac56fa First revision of changes to clean up acinclude and configure.in. Removed all AC_DEFUN out to separate m4 files, removed rule concerning building the website, and updated SANITY rule with the latest from 1.8. 
configure.in:
  Removed all defines, and added include files.
 2004-12-01 17:02:22 -08:00
unknown
14bc43bdf0 ps_7ndb.result: 
fixed ps_7ndb test


mysql-test/r/ps_7ndb.result:
  fixed ps_7ndb test
 2004-12-01 17:35:18 +00:00
unknown
5a13ed419d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2004-12-01 13:39:48 +01:00
unknown
2a6a1cbaed Remove unnecessary copyright header from trx0xa.h 
innobase/include/trx0xa.h:
  Remove unnecessary copyright header from trx0xa.h.
 2004-12-01 13:56:04 +02:00
unknown
e32f7a9470 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2004-12-01 12:53:09 +01:00
unknown
10a80328b5 Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
 2004-12-01 12:50:13 +01:00
unknown
e4dbc32f63 testcase for bug#6871, ndb, replace with collations 
mysql-test/r/ndb_charset.result:
  testcase for bug#6871
mysql-test/t/ndb_charset.test:
  testcase for bug#6871
 2004-12-01 10:13:18 +01:00
unknown
62e7f1cae9 bug#6871 - ndb 
replace with charsets
  check update of primary key wo/ normalizing
  


ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Make sure tXfrmFlag is false when checking for update of primary key
 2004-12-01 10:04:49 +01:00
unknown
80d5488f94 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/jan/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
 2004-12-01 09:21:42 +02:00
unknown
843f38fc78 This is a code cleanup patch for X/Open XA. 
BitKeeper/deleted/.del-xa.h~4021d7e61ff515b:
  Delete: innobase/include/xa.h
innobase/include/trx0trx.h:
  Change xa.h to trx0ha.h.
innobase/include/trx0undo.h:
  Split TRX_UNDO_DICT_OPERATION field to two fiels: first contains
  TRX_UNDO_XID_EXISTS flag which is TRUE if log header contains
  X/Open XA XID and the second one contains TRX_UNDO_DICT_TRANS
  flag which is TRUE if the transaction is dictionary transaction.
innobase/trx/trx0trx.c:
  Remove unnecessary and erroneus code from prepare. Add some 
  informative printouts of prepared transactions.
innobase/trx/trx0undo.c:
  Split TRX_UNDO_DICT_OPERATION field to two fields: the first field
  is TRX_UNDO_XID_EXISTS flag which is true if the log header contains
  X/Open XA XID and the second field is TRX_UNDO_DICT_TRANS flag
  which is true if the transaction was a dictionary transaction.
sql/ha_innodb.cc:
  Code cleanup.
 2004-12-01 09:20:32 +02:00
unknown
6dd876715e strict.result: 
Add warning line to result so that test passes


mysql-test/r/strict.result:
  Add warning line to result so that test passes
 2004-12-01 00:30:42 +01:00
unknown
1e1654fe21 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into avenger.(none):/export/brian/mysql/merge/5.0


innobase/include/row0mysql.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
 2004-11-30 13:42:19 -08:00
unknown
b5622875aa Merge avenger.(none):/export/brian/mysql/merge/4.1 
into avenger.(none):/export/brian/mysql/merge/5.0


sql/mysqld.cc:
  Auto merged
 2004-11-30 12:51:59 -08:00
unknown
4579806f46 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-30 21:51:58 +01:00
unknown
ac2072938f fixed so that warning on missing support for engine only printed once even if option given multiple times 2004-11-30 20:51:57 +00:00
unknown
928d2a8b80 typo fixed 2004-11-30 21:17:03 +01:00
unknown
9ada34b316 Merge for Matt for Innodb bug. 
client/mysqldump.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_grant.later:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/my_print_defaults.def:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysql_test_run.def:
  Auto merged
netware/mysql_waitpid.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
netware/mysqltest.def:
  Auto merged
netware/pack_isam.def:
  Auto merged
netware/perror.def:
  Auto merged
netware/replace.def:
  Auto merged
netware/resolve_stack_dump.def:
  Auto merged
netware/resolveip.def:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
client/mysqladmin.cc:
  Merge for Netware changes. Indention fixes.
sql/field.cc:
  Merge fixes, warnings added from 4.1 to 5.0
sql/mysqld.cc:
  Merge fixes, just indention fixes.
 2004-11-30 10:10:40 -08:00
unknown
f299ff85b5 row0mysql.h, ha_innodb.cc: 
Sergey Petrunia's ROR code fails to tell handlers that they should retrieve the primary key columns; let InnoDB ALWAYS retrieve them, to fix many bugs and potential bugs


sql/ha_innodb.cc:
  Sergey Petrunia's ROR code fails to tell handlers that they should retrieve the primary key columns; let InnoDB ALWAYS retrieve them, to fix many bugs and potential bugs
innobase/include/row0mysql.h:
  Sergey Petrunia's ROR code fails to tell handlers that they should retrieve the primary key columns; let InnoDB ALWAYS retrieve them, to fix many bugs and potential bugs
 2004-11-30 19:56:25 +02:00
unknown
be733ad13f fixed error in test result 
added extra calls to retrieve connectstring used
    reengineered connect somewhat to make retries etc explicit


mysql-test/r/ndb_index_unique.result:
  fixed error in test result
ndb/include/mgmapi/mgmapi.h:
  added extra calls to retrieve connectstring used
ndb/include/mgmcommon/ConfigRetriever.hpp:
  added extra calls to retrieve connectstring used
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  added extra calls to retrieve connectstring used
  reengineered connect somewhat to make retries etc explicit
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  added extra calls to retrieve connectstring used
ndb/src/mgmapi/mgmapi.cpp:
  added extra calls to retrieve connectstring used
ndb/src/mgmclient/CommandInterpreter.cpp:
  moved parse of quit to avoid connect before
ndb/src/ndbapi/Ndbinit.cpp:
  reengineered connect somewhat to make retries etc explicit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added extra calls to retrieve connectstring used
  reengineered connect somewhat to make retries etc explicit
ndb/tools/listTables.cpp:
  reengineered connect somewhat to make retries etc explicit
sql/ha_ndbcluster.cc:
  added extra calls to retrieve connectstring used
  reengineered connect somewhat to make retries etc explicit
 2004-11-30 17:47:47 +00:00
unknown
99e69f2660 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/k/mysql-4.1


innobase/lock/lock0lock.c:
  Auto merged
 2004-11-30 17:52:30 +02:00
unknown
93d5f62e38 lock0lock.c: 
If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this


innobase/lock/lock0lock.c:
  If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
 2004-11-30 17:51:10 +02:00
unknown
892cec8555 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/k/mysql-4.1
 2004-11-30 17:50:56 +02:00
unknown
668d61b946 row0sel.c: 
Remove compiler warning as I had forgotten an include file


innobase/row/row0sel.c:
  Remove compiler warning as I had forgotten an include file
 2004-11-30 17:48:30 +02:00
unknown
795045d9a0 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/k/mysql-4.1
 2004-11-30 17:48:30 +02:00
unknown
fc157af39d use sql_print_warning instead of push_warning in mysqld.cc 2004-11-30 15:48:29 +00:00
unknown
d6180d37be InnoDB: Allow ALTER TABLE to do intermediate COMMIT also when the table 
contains auto_increment columns.  (Bug )


innobase/include/lock0lock.h:
  Replaced lock_get_table()
  with lock_get_src_table() and lock_is_table_exclusive()
innobase/lock/lock0lock.c:
  Replaced lock_get_table()
  with lock_get_src_table() and lock_is_table_exclusive()
sql/ha_innodb.cc:
  ha_innobase::write_row(): Improve the ALTER TABLE optimization
  (do intermediate COMMIT also if table contains auto_increment columns)
 2004-11-30 17:34:37 +02:00
unknown
ea6614855f ps_7ndb.result, ps_7ndb.test: 
ndb now runs ps tests just like the others


mysql-test/t/ps_7ndb.test:
  ndb now runs ps tests just like the others
mysql-test/r/ps_7ndb.result:
  ndb now runs ps tests just like the others
 2004-11-30 15:08:26 +00:00
unknown
cb6007ceb6 mysqld.cc: 
fixed erroneous previous push


sql/mysqld.cc:
  fixed erroneous previous push
 2004-11-30 14:52:05 +00:00
unknown
16a130a232 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
 2004-11-30 12:17:21 +00:00
unknown
07ed8294fa added check connection mgmapi method 
added ndb_mgm_check_connection when error is printed


ndb/include/mgmapi/mgmapi.h:
  added check connection mgmapi method
ndb/src/mgmapi/mgmapi.cpp:
  added check connection mgmapi method
ndb/src/mgmclient/CommandInterpreter.cpp:
  added mgm_check_check_connection when error is printed
ndb/src/mgmsrv/Services.cpp:
  added check connection mgmapi method
ndb/src/mgmsrv/Services.hpp:
  added check connection mgmapi method
 2004-11-30 12:02:53 +00:00
unknown
32fa7e0f4d Portability fix. Why not to use UINT_MAX32 here? 2004-11-30 15:10:48 +04:00
unknown
409debfa14 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into avenger.(none):/export/brian/mysql/archive-delayed
 2004-11-30 03:01:39 -08:00