1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
unknown
9891d05355 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1


innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2004-07-21 08:52:12 +03:00
unknown
b01e2f6ddc error message interception (Bug#4598)
error handling of view initialization fixed (Bug#4599)


include/mysqld_error.h:
  new error message
mysql-test/r/view.result:
  changing of underlaying table test
mysql-test/t/view.test:
  changing of underlaying table test
sql/share/czech/errmsg.txt:
  new error message
sql/share/danish/errmsg.txt:
  new error message
sql/share/dutch/errmsg.txt:
  new error message
sql/share/english/errmsg.txt:
  new error message
sql/share/estonian/errmsg.txt:
  new error message
sql/share/french/errmsg.txt:
  new error message
sql/share/german/errmsg.txt:
  new error message
sql/share/greek/errmsg.txt:
  new error message
sql/share/hungarian/errmsg.txt:
  new error message
sql/share/italian/errmsg.txt:
  new error message
sql/share/japanese/errmsg.txt:
  new error message
sql/share/korean/errmsg.txt:
  new error message
sql/share/norwegian-ny/errmsg.txt:
  new error message
sql/share/norwegian/errmsg.txt:
  new error message
sql/share/polish/errmsg.txt:
  new error message
sql/share/portuguese/errmsg.txt:
  new error message
sql/share/romanian/errmsg.txt:
  new error message
sql/share/russian/errmsg.txt:
  new error message
sql/share/serbian/errmsg.txt:
  new error message
sql/share/slovak/errmsg.txt:
  new error message
sql/share/spanish/errmsg.txt:
  new error message
sql/share/swedish/errmsg.txt:
  new error message
sql/share/ukrainian/errmsg.txt:
  new error message
sql/sql_base.cc:
  error message interception
  error handling fixed
sql/sql_view.cc:
  comment fixed
  error message interception
sql/table.cc:
  error message interception
sql/table.h:
  error message interception
2004-07-21 04:26:20 +03:00
unknown
bf95f9195f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-07-21 00:53:10 +02:00
unknown
5a37da8ece Sanja will probably rework this tomorrow; we need to unify the normal
client code and replication slave code, as far as LOAD DATA INFILE and
other queries' execution is concerned. Duplication of code leads to
replication bugs, because the replication duplicate lags much behind.
Fix for 2 Valgrind errors on slave replicating LOAD DATA INFILE
  - one serious (causing a random test failure in rpl_loaddata in 5.0)
  - one not serious (theoretically a bug but not dangerous): uninited thd->row_count


sql/log_event.cc:
  Fix for 2 Valgrind errors:
  - one serious (causing a random test failure in rpl_loaddata in 5.0): uninited lex in replic of LOAD DATA INFILE on slave
  - one not serious (theoretically a bug but not dangerous): uninited thd->row_count in replication of LOAD DATA INFILE on slave.
  Sanja is likely to rework the fix to the 1st problem tomorrow.
2004-07-21 00:52:35 +02:00
unknown
09ea3e09a4 Merge bk-internal:/home/bk/mysql-5.0/
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-07-21 00:46:09 +02:00
unknown
d0c693999b misc fixes for compile-time errors
sql/item_sum.cc:
  "unused variable" warning
sql/item_timefunc.cc:
  "unused variable" warning
sql/log_event.h:
  const bool is_valid() -> bool is_valid() const
sql/opt_range.cc:
  cast log's argument to double (otherwise an error on some compilers)
sql/opt_range.h:
  get_quick_select_for_ref should be declared in the global scope to be visible.
2004-07-21 00:45:08 +02:00
unknown
9ec353da53 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-07-20 23:54:13 +03:00
unknown
325de4ebf1 Updates for archive storage engine.
sql/examples/ha_archive.cc:
  Corrections from Bar's comments. Mainly small code changes/style changes.
2004-07-20 13:25:55 -07:00
unknown
ab60fb1479 sql_show.cc:
Add views privileges to SHOW PRIVILEGES output.
  (Bug #4656)


sql/sql_show.cc:
  Add views privileges to SHOW PRIVILEGES output.
  (Bug #4656)
2004-07-20 15:03:22 -05:00
unknown
e92ca135ff Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0


mysql-test/r/subselect.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2004-07-20 22:10:47 +03:00
unknown
b0b75bbfbb fixed quoting of identifiers in VIEWs (BUG#4613)
mysql-test/r/view.result:
  fixed quoting of identifiers in VIEWs
mysql-test/t/view.test:
  fixed quoting of identifiers in VIEWs
sql/item.cc:
  fixed quoting of identifiers in VIEWs
sql/sql_select.cc:
  fixed quoting of identifiers in VIEWs
sql/sql_view.cc:
  fixed quoting of identifiers in VIEWs
2004-07-20 18:51:02 +03:00
unknown
e2d25910f8 manual merge
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
include/my_global.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2004-07-20 15:34:57 +02:00
unknown
238b226f26 Added innodb_locks_unsafe_for_binlog option. This option turns off Innodb
next-key locking. Using this option the locks InnoDB sets on index 
  records do not affect the ``gap'' before that index record. Thus, this option
  allows phantom problem.


innobase/include/srv0srv.h:
  Added srv_locks_unsafe_for_binlog for innodb_locks_unsafe_for_binlog option.
innobase/row/row0sel.c:
  If innodb_locks_unsafe_for_binlog option is used, we lock only the record, i.e. 
  next-key locking is not used. Therefore, setting lock to the index record
  do not affect the ``gap'' before that index record. Thus, this option
  allows phantom problem, because concurrent insert operations are allowed inside 
  the select range.
innobase/srv/srv0srv.c:
  Added srv_locks_unsafe_for_binlog for innodb_locks_unsafe_for_binlog option.
sql/ha_innodb.cc:
  Added innobase_locks_unsafe_for_binlog and srv_locks_unsafe_for_binlog for 
  innodb_locks_unsafe_for_binlog option.
sql/ha_innodb.h:
  Added innobase_locks_unsafe_for_binlog for innodb_locks_unsafe_for_binlog option.
sql/mysqld.cc:
  Added OPT_INNODB_LOCKS_UNSAFE_FOR_BINLOG, innobase_locks_unsafe_for_binlog for
  innodb_locks_unsafe_for_binlog option.
sql/set_var.cc:
  Added innodb_locks_unsafe_for_binlog and innobase_locks_unsafe_for_binlog for
  innodb_locks_unsafe_for_binlog option.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-20 14:15:38 +03:00
unknown
26821ee3f5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-20 11:14:20 +02:00
unknown
9050c44cff fix case what VIEW have not tables (BUG#4614)
mysql-test/r/view.result:
  test of VIEW without tables
mysql-test/t/view.test:
  test of VIEW without tables
sql/sql_view.cc:
  fix case what VIEW have not tables
2004-07-20 10:34:39 +03:00
unknown
ec33aa2bee mark subquery in the FROM clause like derived and quoate all identifiers (BUG#4609)
mysql-test/r/bench_count_distinct.result:
  Quoting of fields and tables names
mysql-test/r/case.result:
  Quoting of fields and tables names
mysql-test/r/fulltext.result:
  Quoting of fields and tables names
mysql-test/r/func_default.result:
  Quoting of fields and tables names
mysql-test/r/func_gconcat.result:
  Quoting of fields and tables names
mysql-test/r/func_group.result:
  Quoting of fields and tables names
mysql-test/r/func_if.result:
  Quoting of fields and tables names
mysql-test/r/func_in.result:
  Quoting of fields and tables names
mysql-test/r/func_regexp.result:
  Quoting of fields and tables names
mysql-test/r/func_test.result:
  Quoting of fields and tables names
mysql-test/r/gis.result:
  Quoting of fields and tables names
mysql-test/r/group_by.result:
  Quoting of fields and tables names
mysql-test/r/having.result:
  Quoting of fields and tables names
mysql-test/r/insert_update.result:
  Quoting of fields and tables names
mysql-test/r/join_nested.result:
  Quoting of fields and tables names
mysql-test/r/olap.result:
  Quoting of fields and tables names
mysql-test/r/query_cache.result:
  Quoting of fields and tables names
mysql-test/r/select.result:
  Quoting of fields and tables names
mysql-test/r/subselect.result:
  Quoting of fields and tables names
mysql-test/r/union.result:
  Quoting of fields and tables names
mysql-test/r/varbinary.result:
  Quoting of fields and tables names
mysql-test/r/view.result:
  Quoting of fields and tables names
  test of view with quated fields
mysql-test/t/view.test:
  test of view with quated fields
sql/item.cc:
  Quoting of fields and tables names
sql/item.h:
  Quoting of fields and tables names
sql/sql_select.cc:
  Quoting of fields and tables names
sql/sql_view.cc:
  mark subquery in the FROM clause like derived
2004-07-20 08:48:28 +03:00
unknown
3f5e1ba9ea compare correct types 2004-07-20 02:44:39 +02:00
unknown
eee5f15b92 manual merged (blame me!)
Build-tools/Do-compile:
  Auto merged
Docs/Makefile.am:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/include/lock0lock.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0arr.h:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/r/innodb.result:
  to be fixed after the merge
2004-07-20 00:53:24 +02:00
unknown
784191d9ce Compilation failure on Windows fixed. 2004-07-19 15:12:23 -07:00
unknown
f0957bcc61 fixed case when frivileges check switched off (BUG#4631)
mysql-test/r/view.result:
  test made more environment independed
mysql-test/t/view.test:
  test made more environment independed
sql/sql_acl.cc:
  fixed case when frivileges check switched off
2004-07-20 01:01:02 +03:00
unknown
f1d2c051ae Fixes for MSVC++ compiler.
libmysql/client_settings.h:
  Fixed declaration to be in line with definition
sql/sql_select.cc:
  Not used variable removed.
sql/sql_view.cc:
  Explicit cast to unsigned char * is required here.
2004-07-19 13:43:19 -07:00
unknown
d57d78ac10 handler.cc:
Revise output of SHOW ENGINES.


sql/handler.cc:
  Revise output of SHOW ENGINES.
2004-07-19 15:09:21 -05:00
unknown
e5c416e4f1 Fix for bug#4595 2004-07-19 17:28:07 +02:00
unknown
6592c1af0c make acl_init() more robust -
don't be confused if  new privilege - ENUM ('N','Y') - columns are added (mostly because of downgrade)
  don't expect NOT NULL fields to never contain a NULL :) - somebody may've changed table definition, or we may be reading the wrong column
2004-07-19 16:01:53 +02:00
unknown
10d0dca6b4 standard values for table type in SHOW TABLES (BUG#4603)
mysql-test/r/connect.result:
  standard values for table type in SHOW TABLES
mysql-test/r/ctype_recoding.result:
  standard values for table type in SHOW TABLES
mysql-test/r/drop.result:
  standard values for table type in SHOW TABLES
mysql-test/r/greedy_optimizer.result:
  fixed results
mysql-test/r/lowercase_table.result:
  standard values for table type in SHOW TABLES
mysql-test/r/ps_1general.result:
  standard values for table type in SHOW TABLES
mysql-test/r/rename.result:
  standard values for table type in SHOW TABLES
mysql-test/r/rpl000009.result:
  standard values for table type in SHOW TABLES
mysql-test/r/rpl_error_ignored_table.result:
  standard values for table type in SHOW TABLES
mysql-test/r/select.result:
  standard values for table type in SHOW TABLES
mysql-test/r/system_mysql_db.result:
  standard values for table type in SHOW TABLES
mysql-test/r/view.result:
  standard values for table type in SHOW TABLES
sql/sql_show.cc:
  standard values for table type in SHOW TABLES
  debugging trap
2004-07-19 12:07:33 +03:00
unknown
d590b04708 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb


mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-07-19 09:09:40 +02:00
unknown
382ff793bb Fix for BUG#4551 "Temporary InnoDB tables not replicated properly with CREATE TABLE .. SELECT"
The problem was that (for any storage engine), the created temporary table was not removed if CREATE SELECT failed (because
of a constraint violation for example). This was not consistent with the manual and with CREATE SELECT (no TEMPORARY).


sql/sql_insert.cc:
  Fix for BUG#4551 "Temporary InnoDB tables not replicated properly with CREATE TABLE .. SELECT"
  The problem was that (for any storage engine), the created temporary table was not removed if CREATE SELECT failed (because
  of a constraint violation for example). This was not consistent with the manual and with CREATE SELECT (no TEMPORARY).
  And it led to the above bug, because the binlogging of CREATE SELECT is done by select_insert::send_eof() (same function
  as INSERT SELECT) and so, if the table is transactional and there is a failure, the statement is considered as rolled
  back and so nothing is written in the binlog. So temp table MUST be deleted.
2004-07-18 14:34:35 +02:00
unknown
474c2578c5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-07-17 17:10:52 +02:00
unknown
cf8dbcc683 Fixes for
BUG#4506 "mysqlbinlog --position --read-from-remote-server has wrong "# at" lines",
BUG#4553 "Multi-table DROP TABLE replicates improperly for nonexistent table" with a test file.
It was not possible to add a test for BUG#4506 as in the test suite we must use --short-form
which does not display the "# at" lines.


client/mysqlbinlog.cc:
  Fix for BUG#4506 "mysqlbinlog --position --read-from-remote-server has wrong "# at" lines"
  when reading a remote binlog, the start position is not always BIN_LOG_HEADER_SIZE (4).
sql/sql_table.cc:
  Fix for BUG#4553 "Multi-table DROP TABLE replicates improperly for nonexistent table"
  we must my_error() _before_ we write to the binlog, so that a meaningful error code is available
  in thd->net.last_errno for storage of the DROP TABLE statement into the binlog.
2004-07-17 16:58:16 +02:00
unknown
851154ee30 sql_select.cc:
if many plans have identical cost, which one will be used depends on how compiler optimizes floating-point calculations
  this fix adds repeatability to the optimizer


sql/sql_select.cc:
  if many plans have identical cost, which one will be used depends on how compiler optimizes floating-point calculations
  this fix adds repeatability to the optimizer
2004-07-17 16:15:32 +02:00
unknown
be922a58e9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1


sql/item_subselect.cc:
  Auto merged
2004-07-17 02:13:02 +03:00
unknown
910131fd23 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-07-17 01:08:25 +03:00
unknown
df94015604 satisfy VC++ 2004-07-16 23:44:14 +03:00
unknown
ce12d89e6b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-07-16 22:54:16 +03:00
unknown
27bbc701af changes to sutisfy VC++ 2004-07-16 22:48:56 +03:00
unknown
3d879214be Merge miguel@bk-internal.mysql.com:/home/bk/mysql-5.0
into hegel.txg:/home/miguel/bk/mysql-5.0
2004-07-16 14:27:20 -03:00
unknown
7834fdfd23 fix function prototype 2004-07-16 19:42:38 +03:00
unknown
1fd2fdfa49 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1
2004-07-16 15:47:28 +03:00
unknown
2c6a2b5306 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-07-16 15:45:06 +03:00
unknown
a9908e5c41 memory leak removing
BitKeeper/etc/ignore:
  Added libmysqld/sql_view.cc to the ignore list
2004-07-16 15:20:51 +03:00
unknown
be0e166f53 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-16 13:33:57 +02:00
unknown
0d07df3d8d in 4.1 DATABASE() may be NULL 2004-07-16 13:21:58 +02:00
unknown
45cbab28f6 Fixes for bug #4571 (Windows compabilities)
sql/opt_range.cc:
  Fix for unreferenced local variable, cast and indirection to different types
sql/sp_head.cc:
  Fix for unreferenced variables and cast
sql/sql_acl.cc:
  Fix for unreferenced variable
sql/sql_db.cc:
  Fix for unreferenced variable and cast
sql/sql_insert.cc:
  Fix for cast and redifinition of variable declared  i (VC++ bug)
sql/sql_parse.cc:
  Fix for cast
sql/sql_update.cc:
  Fix for cast
2004-07-16 03:47:17 -03:00
unknown
acdf855008 Fixed typo in sql/sql_insert.cc which caused non-debug builds to fail.
sql/sql_insert.cc:
  Fixed typo which caused non-debug builds to fail.
2004-07-16 09:45:44 +04:00
unknown
e746304663 Fix warnings in sql/item_timefunc.cc which popped up during windows builds.
sql/item_timefunc.cc:
  Fix warnings which popped up during windows builds.
2004-07-16 07:35:41 +04:00
unknown
80469ba4a4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-view3-5.0


sql/set_var.cc:
  Auto merged
2004-07-16 01:27:13 +03:00
unknown
8790b1e65c VIEW
two TABLE_LIST copy eliminated


include/mysqld_error.h:
  errors of view
libmysqld/Makefile.am:
  new view file
mysql-test/r/connect.result:
  SHOW TABLE show type of table
mysql-test/r/ctype_recoding.result:
  SHOW TABLE show type of table
mysql-test/r/drop.result:
  SHOW TABLE show type of table
mysql-test/r/grant.result:
  new two privileges (CRETEA|SHOW VIEW)
mysql-test/r/lowercase_table.result:
  SHOW TABLE show type of table
mysql-test/r/ps_1general.result:
  SHOW TABLE show type of table
mysql-test/r/rename.result:
  SHOW TABLE show type of table
mysql-test/r/rpl000009.result:
  SHOW TABLE show type of table
mysql-test/r/rpl_error_ignored_table.result:
  SHOW TABLE show type of table
mysql-test/r/select.result:
  SHOW TABLE show type of table
mysql-test/r/system_mysql_db.result:
  SHOW TABLE show type of table
  new two privileges (CRETEA|SHOW VIEW)
mysql-test/t/system_mysql_db_fix.test:
  removing all system tables
scripts/mysql_fix_privilege_tables.sql:
  new two privileges (CRETEA|SHOW VIEW)
sql/Makefile.am:
  new VIEW related file
sql/ha_myisammrg.cc:
  two TABLE_LIST copy eliminated
sql/item.cc:
  VIEW
sql/item.h:
  VIEW
sql/item_subselect.cc:
  VIEW
sql/item_subselect.h:
  VIEW
sql/lex.h:
  VIEW
sql/lock.cc:
  VIEW
sql/mysql_priv.h:
  VIEW
sql/mysqld.cc:
  VIEW
  new parameter - sql_updatable_view_key
sql/opt_sum.cc:
  two TABLE_LIST copy eliminated
sql/set_var.cc:
  new parameter - sql_updatable_view_key
sql/share/czech/errmsg.txt:
  errors messages of views
sql/share/danish/errmsg.txt:
  errors messages of views
sql/share/dutch/errmsg.txt:
  errors messages of views
sql/share/english/errmsg.txt:
  errors messages of views
sql/share/estonian/errmsg.txt:
  errors messages of views
sql/share/french/errmsg.txt:
  errors messages of views
sql/share/german/errmsg.txt:
  errors messages of views
sql/share/greek/errmsg.txt:
  errors messages of views
sql/share/hungarian/errmsg.txt:
  errors messages of views
sql/share/italian/errmsg.txt:
  errors messages of views
sql/share/japanese/errmsg.txt:
  errors messages of views
sql/share/korean/errmsg.txt:
  errors messages of views
sql/share/norwegian-ny/errmsg.txt:
  errors messages of views
sql/share/norwegian/errmsg.txt:
  errors messages of views
sql/share/polish/errmsg.txt:
  errors messages of views
sql/share/portuguese/errmsg.txt:
  errors messages of views
sql/share/romanian/errmsg.txt:
  errors messages of views
sql/share/russian/errmsg.txt:
  errors messages of views
sql/share/serbian/errmsg.txt:
  errors messages of views
sql/share/slovak/errmsg.txt:
  errors messages of views
sql/share/spanish/errmsg.txt:
  errors messages of views
sql/share/swedish/errmsg.txt:
  errors messages of views
sql/share/ukrainian/errmsg.txt:
  errors messages of views
sql/slave.cc:
  two TABLE_LIST copy eliminated
sql/sp.cc:
  VIEW
sql/sql_acl.cc:
  VIEW
sql/sql_acl.h:
  VIEW
sql/sql_base.cc:
  VIEW
sql/sql_cache.cc:
  two TABLE_LIST copy eliminated
sql/sql_class.h:
  VIEW
sql/sql_db.cc:
  two TABLE_LIST copy eliminated
sql/sql_delete.cc:
  VIEW
sql/sql_derived.cc:
  VIEW
sql/sql_handler.cc:
  two TABLE_LIST copy eliminated
sql/sql_help.cc:
  two TABLE_LIST copy eliminated
sql/sql_insert.cc:
  VIEW
sql/sql_lex.cc:
  VIEW
sql/sql_lex.h:
  VIEW
sql/sql_load.cc:
  VIEW
sql/sql_olap.cc:
  VIEW
sql/sql_parse.cc:
  two TABLE_LIST copy eliminated
  VIEW
sql/sql_prepare.cc:
  VIEW
sql/sql_rename.cc:
  two TABLE_LIST copy eliminated
sql/sql_select.cc:
  VIEW
sql/sql_show.cc:
  VIEW
sql/sql_table.cc:
  VIEW
sql/sql_union.cc:
  VIEW
sql/sql_update.cc:
  VIEW
sql/sql_yacc.yy:
  VIEW
sql/table.cc:
  VIEW
sql/table.h:
  VIEW
sql/tztime.cc:
  two TABLE_LIST copy eliminated
sql/unireg.h:
  VIEW
tests/client_test.c:
  VIEW
2004-07-16 01:15:55 +03:00
unknown
28f76c5024 Merge gbichot@bk-internal.mysql.com://home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0
2004-07-15 23:35:27 +02:00
unknown
898ceb0f96 after merge fixes (making rpl_charset and rpl_timezone pass).
Replication of charsets and timezones should shortly be changed to not need ONE_SHOT
(but 5.0 should still be able to read it, to be able to replicate 4.1 masters).


mysql-test/r/rpl_charset.result:
  result update after the merge (only binlog positions differ from 4.1)
mysql-test/r/rpl_timezone.result:
  result update after the merge (only binlog positions differ from 4.1)
sql/log.cc:
  use ONE_SHOT to save charset and TZ info in the binlog (until I rewrite this soon)
sql/set_var.cc:
  Even if in the future, 5.0 will not use ONE_SHOT in ITS binlog, it must still be able to interpret it, to make 4.1->5.0 replication possible
sql/set_var.h:
  Even if in the future, 5.0 will not use ONE_SHOT in ITS binlog, it must still be able to interpret it, to make 4.1->5.0 replication possible
2004-07-15 23:34:41 +02:00
unknown
b0df20349d failing fulltext_order_by.test fixed
myisam/sort.c:
  warning fixed
sql/ha_myisam.h:
  not necessary
2004-07-15 17:30:55 +02:00