Commit graph

17559 commits

Author SHA1 Message Date
unknown
9a2c0bd932 Enlarged group item key_length by a varstring length field.
Group item fields are implemented as varstrings nowadays.
Made init_connect.test robust against existing t1.


mysql-test/r/init_connect.result:
  Made init_connect.test robust against existing t1.
mysql-test/t/init_connect.test:
  Made init_connect.test robust against existing t1.
sql/sql_select.cc:
  Enlarged group item key_length by a varstring length field.
  Group item fields are implemented as varstrings nowadays.
2004-12-16 11:41:52 +01:00
unknown
eaec00b19b Portability fix in libmysql (FreeBSD)
include/my_global.h:
  Define UINT_MAX8
libmysql/libmysql.c:
  Replace defines for insteger limits with their custom MySQL versions.
2004-12-16 12:43:02 +03:00
unknown
868266f1b1 Print a error message if the handler don't support transactional table
locks (LOCK TABLES ... WHERE ENGINE = ).
 


sql/handler.h:
  Return a error if the handler don't support transactional table locks.
sql/lock.cc:
  Print a error message if the handler don't support transactional table
  locks.
2004-12-16 09:52:19 +02:00
unknown
d518f87171 Added support for a CREATE TABLE...AUTO_INCREMENT = x in InnoDB.
sql/ha_innodb.cc:
  Added support for a CREATE TABLE...AUTO_INCREMENT = x; Note that the new
  value for auto increment field is set if the new values is creater than
  the maximum value in the column.
2004-12-16 08:34:03 +02:00
unknown
7845f99abf Data truncation reporting implementation (libmysql) + post review
fixes. Still to do: 
-  deploy my_strtoll10 in limbysql.c
- add mysql_options option to switch MYSQL_DATA_TRUNCATED on and off.


include/my_time.h:
  More calls are shared between client and server (libmysql now performs
  more intelligent date->number and number->date conversions).
  TODO: rename those which are not starting with 'my_'
include/mysql.h:
  MYSQL_BIND:
  - more elaborated comment
  - some of the ex-private members were given public names - 
    it's sometimes convenient to set bind->error to &bind->error_value.
    However Monty questions the idea, so it should be given
    more thought in future.
  - added new members to support data truncation.
  Added new return value of mysql_stmt_fetch, MYSQL_DATA_TRUNCATED.
libmysql/libmysql.c:
  - added support for data truncation during fetch
  - implementation for is_binary_compatible: now conversion functions
    are used less frequently
  - we now use number_to_datetime and TIME_to_ulonglong for date->number and
    number->date conversions
sql-common/my_time.c:
  - added implementation of date->number and number->date calls shared 
    between client and server (moved from time.cc).
sql/field.cc:
  - implemented Field_time::store_time() to better support date->time
    conversions in prepared mode. After-review fixes.
sql/field.h:
  - Field::store_time now returns int
sql/mysql_priv.h:
  - removed date->number and number->date conversion functions headers
    (moved to my_time.h)
sql/time.cc:
  - removed implementation of date->number and number->date conversion
    functions (moved to my_time.c)
tests/client_test.c:
  - added a test case for data truncation; other test cases adjusted.
  - fixed my_process_stmt_result to set STMT_ATTR_UPDATE_MAX_LENGTH (tables
    are now printed out prettier).
2004-12-16 03:15:06 +03:00
unknown
79bf1ca8d9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0
2004-12-15 20:30:15 +03:00
unknown
e87d4e6d18 Fix for IM compilation failure (reported be Ramil).
server-tools/instance-manager/thread_registry.h:
  Fix for the problem, encountered by Ramil
2004-12-15 20:29:17 +03:00
unknown
1815015080 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/new/mysql-5.0
2004-12-15 15:36:37 +02:00
unknown
1bea012cce Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2004-12-15 10:31:08 +02:00
unknown
526fbcbbc5 Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-14 22:26:31 +03:00
unknown
9a3de94474 Fixed compile error in extra/comp_err.c with -debug for some compilers.
extra/comp_err.c:
  Fixed compile error with -debug for some compilers.
2004-12-14 17:02:24 +01:00
unknown
8d45c5f9d0 Fix for bug #7220: information_schema: errors in "character_sets" 2004-12-14 16:18:59 +03:00
unknown
0d9ac947b0 Fx for bug#7221: information_schema: errors in "key_column_usage" 2004-12-14 15:20:46 +03:00
unknown
b603cbc3ba Fix bug#7222 information_schema: errors in "routines" 2004-12-14 14:55:28 +03:00
unknown
a9973c1b92 Fix for bug #7223: information_schema: error in "views" 2004-12-14 13:41:32 +03:00
unknown
b601f1200b Fixed typo 2004-12-14 13:21:38 +03:00
unknown
83f6429c42 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2004-12-14 08:23:55 +02:00
unknown
0a09408da2 Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug;
BitKeeper/etc/ignore:
  added extra/created_include_files
extra/Makefile.am:
  Make sure that mysqld_error.h and sql_state.h are not build in the same time.
extra/comp_err.c:
  Fixed segfault bug
libmysqld/Makefile.am:
  Added path to mysqld_error.h and sql_state.h
libmysqld/examples/Makefile.am:
  Added path to mysqld_error.h and sql_state.h
scripts/make_win_src_distribution.sh:
  Windows version fix
2004-12-14 01:54:16 +02:00
unknown
51c2c581f1 Added missing errmsg.txt
BitKeeper/etc/ignore:
  added extra/sql_state.h
2004-12-13 23:28:24 +02:00
unknown
87275b2866 WL#1051, more maintanable error messages.
BitKeeper/deleted/.del-mysqld_error.h~9dac75782467aab7:
  Delete: include/mysqld_error.h
BitKeeper/deleted/.del-sql_state.h~4307ea5f1fe99019:
  Delete: include/sql_state.h
BitKeeper/deleted/.del-errmsg.txt~ba132dc9bc936c8a:
  Delete: sql/share/czech/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
  Delete: sql/share/danish/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~ef28b592c7591b7:
  Delete: sql/share/dutch/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~11edc4db89248c16:
  Delete: sql/share/french/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~184eb1f09242dc72:
  Delete: sql/share/estonian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~898865062c970766:
  Delete: sql/share/greek/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~94a93cc742fca24d:
  Delete: sql/share/german/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Delete: sql/share/english/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~2cdeb8d6f80eba72:
  Delete: sql/share/norwegian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~587903f9311db2d1:
  Delete: sql/share/italian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~9dab24f7fb11b1e1:
  Delete: sql/share/korean/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~e3183b99fbba0a9c:
  Delete: sql/share/japanese/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~eeb2c47537ed9c23:
  Delete: sql/share/hungarian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~606dfaeb9e81aa4e:
  Delete: sql/share/portuguese/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~7397c423c52c6d2c:
  Delete: sql/share/polish/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~b6181e29d8282b06:
  Delete: sql/share/norwegian-ny/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~e2609fdf7870795:
  Delete: sql/share/romanian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84:
  Delete: sql/share/russian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
  Delete: sql/share/serbian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~6bbd9eac7f0e6b89:
  Delete: sql/share/slovak/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
  Delete: sql/share/swedish/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~f19bfd5d4c918964:
  Delete: sql/share/spanish/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4:
  Delete: sql/share/ukrainian/errmsg.txt
client/Makefile.am:
  Added pass to mysqld_error.j and sql_state.h
extra/Makefile.am:
  Added rules to create mysqld_error.h and sql_state.h
extra/comp_err.c:
  WL#1051
include/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
libmysql/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
libmysql_r/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
server-tools/instance-manager/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
sql/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
sql/share/Makefile.am:
  Removed unnecessary loop over all languages; addred rule to creat <lang>.sys files
tools/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-13 22:51:54 +02:00
unknown
08973f5c93 Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug #7061).
sql/ha_innodb.cc:
  Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug #7061).
  It cant be put on commit because ALTER TABLE will commit on every 10000 rows.
  Therefore, this change must be done when a new temporary table is created
  in the ALTER TABLE.
2004-12-13 15:44:45 +02:00
unknown
c4dc0c2583 flush_read_lock_kill-master.opt:
don't make non-debug builds fail the testsuite


mysql-test/t/flush_read_lock_kill-master.opt:
  don't make non-debug builds fail the testsuite
2004-12-13 14:21:59 +01:00
unknown
795a8c829b Fixed problems with deadlocks on LOCK TABLES...WHERE ENGINE = InnoDB.
innobase/lock/lock0lock.c:
  Fixed problem with deadlocks on LOCK TABLES...WHERE ENGINE = InnoDB. Added
  TRX_PREPARED to transaction concurrency states in validate.
2004-12-13 14:22:18 +02:00
unknown
3bee89076e Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug #7061).
sql/ha_innodb.cc:
  Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug #7061).
  If AUTO_INCREMENT is given in the ALTER TABLE, this value is now set
  to the auto increment value of the table if the new value is creater or 
  equal than the current value of the auto increment value. If the new value
  is less than the old value no error message is given and the old value 
  is not changed.
2004-12-13 10:57:26 +02:00
unknown
d2dc0a1086 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0


innobase/include/lock0lock.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-12-13 08:59:52 +02:00
unknown
b952066259 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0
2004-12-12 20:59:50 +03:00
unknown
596876f920 fix autobuild failures
server-tools/instance-manager/buffer.cc:
  fix typo
server-tools/instance-manager/commands.cc:
  get rid of compiler warnings
server-tools/instance-manager/guardian.cc:
  fix compiler warning
server-tools/instance-manager/instance.cc:
  fix warnings
server-tools/instance-manager/instance_map.cc:
  fix return value
server-tools/instance-manager/instance_map.h:
  fix problem, caused autobuild failure. Looks like a gcc problem - 
  "friend class <name>" doesn't work if specified before enclosed class
  <name> (this is not present in newer gcc versions)
2004-12-12 20:59:15 +03:00
unknown
5ae35e327a Fix test results that may change from run to run
Added comments (from code review on pull)


mysql-test/r/heap.result:
  Fix results that may change from run to run
mysql-test/r/ps_5merge.result:
  Fix wrong result
mysql-test/t/heap.test:
  Make results predictable
sql/sql_show.cc:
  Add comments
  Fixed typo
2004-12-12 19:54:26 +02:00
unknown
47c3901518 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-12-12 18:44:15 +02:00
unknown
7d2e580cad First commit to mysql-5.0 tree to include MySQL Federated Storage Handler. This includes both the source and header files, test (results, test, require), and modifications to server and handler base files, and autoconf modifications to properly build federated handler.
configure.in:
  inclusion of federated handler autoheader macro
mysql-test/mysql-test-run.sh:
  allow usage of replication tests for federated handler
sql/Makefile.am:
  inclusion of federated header and source file
sql/field.h:
  overloaded method val_str() to work with fields in 'old_data' in 'update_row()'
sql/handler.cc:
  added code to include federated handler
sql/handler.h:
  add db type for federated
sql/mysql_priv.h:
  added code for federated handler
sql/mysqld.cc:
  added code for federated handler
sql/set_var.cc:
  added code for federated handler
2004-12-11 12:03:51 -08:00
unknown
57867f07b4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
2004-12-10 18:26:21 +03:00
unknown
6bcee4f149 fix according to review 2004-12-10 18:25:12 +03:00
unknown
9d946e8a77 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/j/mysql-5.0
2004-12-10 12:57:10 +02:00
unknown
0404a607a5 InnoDB: Reduce the stack space consumption of ON UPDATE CASCADE
operations.


innobase/include/lock0lock.h:
  Added lock_clust_rec_read_check_and_lock_alt(),
  a variant of lock_clust_rec_read_check_and_lock()
  without the parameter "offsets".
innobase/lock/lock0lock.c:
  Added lock_clust_rec_read_check_and_lock_alt(),
  a variant of lock_clust_rec_read_check_and_lock()
  without the parameter "offsets".
innobase/row/row0ins.c:
  row_ins_foreign_check_on_constraint(): Do not allocate offsets
  from stack. This reduces the stack space consumption of
  ON UPDATE CASCADE operations by 400 bytes per cascaded UPDATE
  operation.
2004-12-10 12:55:56 +02:00
unknown
c7d7c9ca10 Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
mysqldump skips information_schema db
'use' now can use information_schema db
changed value of column 'Null' to 'NO' if column is not nullable


client/mysqldump.c:
  mysqldump skips information_schema db
mysql-test/r/alter_table.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/create.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ctype_collate.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ctype_recoding.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ctype_ujis.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/drop.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/func_sapdb.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/func_time.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/gis.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/information_schema.result:
  Added couple of tests
mysql-test/r/information_schema_inno.result:
  Removed coulmn 'CONTRAINT_METOD' from TABLE_CONSTRAINTS
  Added column 'POSITION_IN_UNIQUE_CONSTRAINT' to KEY_COLUMN_USAGE
mysql-test/r/innodb.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ndb_autodiscover.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ps_1general.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/rpl000009.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/rpl_create_database.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/schema.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/select.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/show_check.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/sp.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/type_enum.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/type_ranges.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/t/information_schema.test:
  Added couple of tests
sql/sql_acl.cc:
  Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
sql/sql_db.cc:
  'use' now can use information_schema db
sql/sql_show.cc:
  code cleanup
  informaton_schema(IS) db now contains data about IS itself
sql/sql_yacc.yy:
  A fix(wrong behavour of 'SHOW COLUMNS, SHOW KEYS' with 'where condition')
2004-12-10 12:07:11 +03:00
unknown
c418ae98ef Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0


innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
2004-12-10 08:49:31 +02:00
unknown
3a2d037139 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


client/mysqltest.c:
  Auto merged
2004-12-10 02:58:39 +02:00
unknown
6f8ca2513e instance.cc:
explicit setting of reconnect (no behaviour change)


server-tools/instance-manager/instance.cc:
  explicit setting of reconnect (no behaviour change)
2004-12-09 22:22:34 +01:00
unknown
2fb4a502bf Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2004-12-09 21:35:15 +01:00
unknown
a5286aa9a1 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
tests/client_test.c:
  Auto merged
2004-12-09 15:42:06 +01:00
unknown
eed2343775 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/j/mysql-5.0
2004-12-09 16:14:11 +02:00
unknown
40c2a8870b Changing the default of libmysqlclient : it's now NO reconnection.
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.


VC++Files/libmysqltest/mytest.c:
  explicit mention of reconnect (no behaviour change)
VC++Files/mysqlmanager/mysqlmanagerview.cpp:
  explicit mention of reconnect (no behaviour change)
VC++Files/test1/mysql_thr.c:
  explicit mention of reconnect (no behaviour change)
VC++Files/winmysqladmin/main.cpp:
  explicit mention of reconnect (no behaviour change)
client/mysql.cc:
  explicit mention of reconnect if embedded (no behaviour change)
client/mysqladmin.cc:
  explicit mention of reconnect (no behaviour change)
client/mysqlbinlog.cc:
  explicit mention of reconnect (no behaviour change)
client/mysqlcheck.c:
  explicit mention of reconnect (no behaviour change)
client/mysqlimport.c:
  explicit mention of NO reconnect (behaviour change). As most time is passed in LOAD DATA INFILE,
  and as it does not make sense to reconnect after a partly failed LOAD... And as mysqlimport sometimes
  does LOCK TABLES where we mustn't reconnect...
client/mysqlshow.c:
  explicit mention of reconnect (no behaviour change)
client/mysqltest.c:
  explicit mention of reconnect (no behaviour change).
  Normally we should not reconnect (it's not good to have silent reconnection in the middle of a test),
  but 5.0 is too touchy to change it now. I'm marking it TODO.
libmysql/libmysql.c:
  explicit mention of reconnect (no behaviour change)
libmysqld/examples/builder-sample/emb_samples.cpp:
  explicit mention of reconnect (no behaviour change)
ndb/test/ndbapi/flex_bench_mysql.cpp:
  explicit mention of reconnect (no behaviour change)
ndb/tools/restore/consumer_restorem.cpp:
  explicit mention of reconnect (no behaviour change)
sql-common/client.c:
  Changing the default of libmysqlclient : it's now NO reconnection.
sql/repl_failsafe.cc:
  explicit mention of reconnect (no behaviour change)
sql/slave.cc:
  explicit mention of reconnect (no behaviour change)
tests/client_test.c:
  explicit mention of reconnect (no behaviour change)
tests/connect_test.c:
  explicit mention of reconnect (no behaviour change)
tests/deadlock_test.c:
  explicit mention of reconnect (no behaviour change)
tests/insert_test.c:
  explicit mention of reconnect (no behaviour change)
tests/list_test.c:
  explicit mention of reconnect (no behaviour change)
tests/select_test.c:
  explicit mention of reconnect (no behaviour change)
tests/showdb_test.c:
  explicit mention of reconnect (no behaviour change)
tests/ssl_test.c:
  explicit mention of reconnect (no behaviour change)
tests/thread_test.c:
  explicit mention of reconnect (no behaviour change)
tools/mysqlmanager.c:
  explicit mention of reconnect (no behaviour change)
2004-12-09 14:44:10 +01:00
unknown
7945222c28 InnoDB: Changed interface to rec_get_offsets(), to reduce the use of
memory heaps.  This changeset plugs also a few memory leaks that
were introduced with the compact InnoDB table format.


innobase/btr/btr0btr.c:
  Changed interface to rec_get_offsets()
innobase/btr/btr0cur.c:
  Changed interface to rec_get_offsets()
innobase/btr/btr0pcur.c:
  Changed interface to rec_get_offsets()
innobase/btr/btr0sea.c:
  Changed interface to rec_get_offsets()
innobase/include/rem0rec.h:
  Changed interface to rec_get_offsets()
innobase/include/rem0rec.ic:
  Changed interface to rec_get_offsets()
innobase/lock/lock0lock.c:
  Changed interface to rec_get_offsets()
innobase/page/page0cur.c:
  Changed interface to rec_get_offsets()
innobase/page/page0page.c:
  Changed interface to rec_get_offsets()
innobase/rem/rem0rec.c:
  Changed interface to rec_get_offsets()
innobase/row/row0ins.c:
  Changed interface to rec_get_offsets()
innobase/row/row0mysql.c:
  Changed interface to rec_get_offsets()
innobase/row/row0purge.c:
  Changed interface to rec_get_offsets()
innobase/row/row0row.c:
  Changed interface to rec_get_offsets()
innobase/row/row0sel.c:
  Changed interface to rec_get_offsets()
innobase/row/row0umod.c:
  Changed interface to rec_print()
innobase/row/row0undo.c:
  Changed interface to rec_get_offsets()
innobase/row/row0upd.c:
  Changed interface to rec_get_offsets()
innobase/row/row0vers.c:
  Changed interface to rec_get_offsets()
innobase/trx/trx0rec.c:
  Changed interface to rec_get_offsets()
2004-12-09 15:29:55 +02:00
unknown
450ac341a5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-12-09 12:29:57 +02:00
unknown
b76b2e68a1 A few simple fixes plus the added support of being able to repair the meta data file via REPAIR TABLE. More information is now provided in SHOW TABLE STATUS.
mysql-test/r/archive.result:
  Added REPAIR TABLE test
mysql-test/t/archive.test:
  Added REPAIR TABLE tests.
sql/examples/ha_archive.cc:
  Added additional code to show more information during a SHOW TABLE STATUS. Curren size of the compressed file is now shown. Also added global "crashed" flag to mark when a table is crashed. Removed autorebuild during open table. Removed a few unneeded actions in OPTIMIZE TABLE. Fixed DBUG_ENTER for end_build_insert().
sql/examples/ha_archive.h:
  Added repair options
2004-12-09 01:48:07 -08:00
unknown
101fdd4eda Content merge.
innobase/include/lock0lock.h:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/handler.h:
  content merge.
2004-12-09 11:20:50 +02:00
unknown
0f99fe728e Added support for a LOCK TABLES...WHERE ENGINE = InnoDB query which sets
transactional table locks to tables mentioned in the query. These locks
are released at the end of the transaction automatically.
This is fix for bugs #5655, #5998 and issue #3762.




innobase/include/lock0lock.h:
  Added a new lock type LOCK_TABLE_TRANSACTIONAL.
innobase/include/trx0trx.h:
  Added a varible to store the number of transactional table locks
  reserved by the transaction and stored in the trx_locks list.
innobase/lock/lock0lock.c:
  Added a lock type LOCK_TABLE_TRANSACTIONAL.
innobase/row/row0mysql.c:
  Added support for a transactional table lock.
innobase/trx/trx0roll.c:
  Make compiler happy and format function.
innobase/trx/trx0trx.c:
  Added information about number of explicit and transactional table locks in
  the innodb monitor.
sql/ha_innodb.cc:
  Added support for a LOCK_TABLE_TRANSACTIONAL table lock (SQLCOM_LOCK_TABLES_TRANSACTIONAL).
  Transactional table locks are taken in the function ::transactional_table_lock().
sql/ha_innodb.h:
  Added prototype for a function trandactional_table_lock().
sql/handler.h:
  Added prototype for a virtual function transactional_table_lock().
  Handler does not need to implement this function.
sql/lock.cc:
  Added a function transactional_lock_tables() to lock all tables in the list
  with transactional table lock. These locks can cause a deadlock and
  this error should be reported back to user.
sql/mysql_priv.h:
  Added prototype for a function transactional_lock_tables().
sql/sql_lex.h:
  Added SQLCOM_LOCK_TABLES_TRANSACTIONAL command.
sql/sql_parse.cc:
  Added SQLCOM_LOCK_TABLES_TRANSACTIONAL command.
sql/sql_yacc.yy:
  Added parsing rules for a LOCK TABLES...WHERE ENGINE = x;
2004-12-09 11:10:45 +02:00
unknown
89e77b65cd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im/mysql-5.0-im
2004-12-09 04:28:37 +03:00
unknown
f7ef17dda1 merge
BitKeeper/etc/ignore:
  auto-union
server-tools/instance-manager/mysqlmanager.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
2004-12-09 04:22:28 +03:00
unknown
0d12a95dde Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-12-08 23:55:01 +02:00