Commit graph

41848 commits

Author SHA1 Message Date
unknown
fa5cc52a43 Merge dsl-hkibras-fe36f900-97.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.1
into  dsl-hkibras-fe36f900-97.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug16567_binlog_verbose_help_jeb


sql/mysqld.cc:
  Auto merged
2007-01-15 19:48:16 +02:00
unknown
7118b2c333 Raise version number after cloning 5.0.34 2007-01-15 16:57:22 +01:00
unknown
df1226ba3f Bug binlog_format option does not show when doing ./mysqd --help --verbose
Implementing this feature connected to wl#3368 mixed binlog_format default.
  Supplied by my.cnf or explicitly in command line option gets be displayed.
  When not supplied `(No default value)' is displayed, even though --log-bin might
  be supplied. The option is different object from @@global.binlog_format variable.
  The default `mixed' for the latter is dependant on presence of `--log-bin' option,
  otherwise the value of the var is set to NULL (undefined):

   var := opt | MIXED  when binlog-in-use
   var := NULL         otherwise (no binlog, no format)

  Comments on NDB and mixed format updated, also dependency the option on --log-bin
  aka binlog-in-use is worded.
  
  Making t/rpl_switch_stm_row_mixed.test to interprete DEFAULT for binlog_format
  as MIXED.
  Comments on what the test covers are added.

  todo/fixme: turning @@global.binlog_format to be read-only when it's set to NULL (no binlog).
  todo/fixme: options dependacy (acyclic) graph, particularly to solve a task of
setting defaults values for the leaf nodes
  only when parents' nodes are set.


mysql-test/r/rpl_switch_stm_row_mixed.result:
  changed
mysql-test/t/rpl_switch_stm_row_mixed.test:
  correcting interpretation of DEFAULT for binlog_format, comments on test purpose,
  switching binlog_format section is formed.
sql/mysqld.cc:
  introducing command line option parser's opt_binlog_format and its default.
  necessary code for transfering text value from command line arg into the system variable
  @@global.binlog_format.
2007-01-15 16:01:00 +02:00
unknown
6034857481 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
VC++Files/sql/mysqldmax.dsp:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/include/hash0hash.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged
2007-01-15 12:13:11 +01:00
unknown
54df7b906e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
2007-01-15 13:57:47 +03:00
unknown
96e5be8ce2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2


sql/sql_select.cc:
  Auto merged
2007-01-15 13:48:07 +03:00
unknown
30393ec4cf Merge bodhi.local:/opt/local/work/mysql-4.1-4968-to-push
into  bodhi.local:/opt/local/work/mysql-5.0-4968-to-push


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Use local
2007-01-15 13:12:37 +03:00
unknown
408d775249 Manual merge.
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2007-01-15 13:10:07 +03:00
unknown
d470c233f7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime
into  bodhi.local:/opt/local/work/mysql-4.1-4968-to-push


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
2007-01-15 13:03:21 +03:00
unknown
d099d94eb5 Merge bodhi.local:/opt/local/work/mysql-5.0-4968-pull-from-4.1
into  bodhi.local:/opt/local/work/mysql-5.1-4968-null-merge


mysql-test/r/ps.result:
  Use local.
mysql-test/r/sp.result:
  Use local
mysql-test/t/ps.test:
  Use local
mysql-test/t/sp.test:
  Use local
sql/mysql_priv.h:
  Use local
sql/sql_class.h:
  Use local
sql/sql_insert.cc:
  Use local
sql/sql_lex.cc:
  Use local
sql/sql_lex.h:
  Use local
sql/sql_list.h:
  Use local
sql/sql_parse.cc:
  Use local
sql/sql_show.cc:
  Use local
sql/sql_table.cc:
  Use local
sql/sql_yacc.yy:
  Use local
2007-01-15 12:40:43 +03:00
unknown
b523c895c2 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390


mysql-test/t/ndb_lock.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/ndb_lock.result:
  Manual merge.
2007-01-15 12:40:07 +03:00
unknown
ffbb896b12 Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build


mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/ha/ha0ha.c:
  Auto merged
storage/innobase/ha/hash0hash.c:
  Auto merged
storage/innobase/include/hash0hash.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/thr/thr0loc.c:
  Auto merged
2007-01-15 10:37:27 +01:00
unknown
810fc001d9 Fix for bug#20390 "SELECT FOR UPDATE does not release locks
of untouched rows in full table scans".

SELECT ... FOR UPDATE/LOCK IN SHARE MODE statements as well as
UPDATE/DELETE statements which were executed using full table
scan were not releasing locks on rows which didn't satisfy
WHERE condition.
This bug surfaced in 5.0 and affected NDB tables. (InnoDB tables
intentionally don't support such unlocking in default mode).

This problem occured because code implementing join didn't call
handler::unlock_row() for rows which didn't satisfy part of condition
attached to this particular table/level of nested loop. So we solve
the problem adding this call.
Note that we already had this call in place in 4.1 but it was lost
(actually not quite correctly placed) when we have introduced nested 
joins.

Also note that additional QA should be requested once this patch is
pushed as interaction between handler::unlock_row() and many recent
MySQL features such as subqueries, unions, views is not tested enough.


mysql-test/r/ndb_lock.result:
  Enabled back part of the test that covers bug  "SELECT FOR
  UPDATE does not release locks of untouched rows in full table scans".
  Adjusted test in such way that it now covers both execution paths
  in which we unlock non-matching rows inspected during table scan.
mysql-test/t/ndb_lock.test:
  Enabled back part of the test that covers bug  "SELECT FOR
  UPDATE does not release locks of untouched rows in full table scans".
  Adjusted test in such way that it now covers both execution paths
  in which we unlock non-matching rows inspected during table scan.
sql/sql_select.cc:
  evaluate_join_record() should call handler::unlock_row() for records
  which don't satisfy condition which was pushed-down to this table/level
  of nested loop.
  We just put back the thing that we already have in 4.1 and which was lost
  when we have introduced nested joins.
2007-01-15 12:32:38 +03:00
unknown
32b013957e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build


configure.in:
  Auto merged
2007-01-15 10:29:55 +01:00
unknown
1b97a266a4 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  dsl-hkibras-fe36f900-97.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/pushed.bug24998_insert_delayed_many_rows
2007-01-14 19:19:58 +02:00
unknown
49462a926a Bug#24998 rpl_row_delayed_ins.test fails in pushbuild
forgotten to push changed results


mysql-test/r/rpl_row_delayed_ins.result:
  changed
2007-01-14 19:15:59 +02:00
unknown
5e64051bb7 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/tmp-5.1


sql/table.cc:
  Auto merged
2007-01-14 13:50:16 +01:00
unknown
8a7a573692 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-01-13 15:08:42 +01:00
unknown
68bd8af2f4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/t/csv.test:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2007-01-12 22:06:46 +03:00
unknown
31e01f0a74 Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
into  bodhi.local:/opt/local/work/mysql-5.0-runtime


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
VC++Files/sql/mysqldmax.dsp:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/include/hash0hash.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged
2007-01-12 22:01:53 +03:00
unknown
fc681ea701 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.0-runtime


sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
2007-01-12 21:59:17 +03:00
unknown
9c06a0b3c4 Fixed windows build break
sql/CMakeLists.txt:
  Fixed windows build break, file item_uniq.cc has been removed.
2007-01-12 10:33:44 -07:00
unknown
87be629efa Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-01-12 16:16:17 +01:00
unknown
8f5e92e052 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-22687


libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-item_uniq.cc:
  Auto merged
BitKeeper/deleted/.del-item_uniq.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2007-01-12 08:11:52 -07:00
unknown
5f9a807562 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
2007-01-12 18:06:43 +03:00
unknown
611299bb29 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into  trift2.:/MySQL/M41/mysql-4.1
2007-01-12 14:40:28 +01:00
unknown
bb48472601 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/CMakeLists.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/rpl_injector.cc:
  Auto merged
sql/rpl_injector.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_locale.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
unittest/mysys/my_atomic-t.c:
  Auto merged
sql/log_event.cc:
  Manual merge main->rpl
sql/mysqld.cc:
  Manual merge main->rpl
2007-01-12 12:31:44 +01:00
unknown
ecc3a61944 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_locale.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2007-01-12 12:22:54 +01:00
unknown
6dc0202617 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge


sql/sql_parse.cc:
  Auto merged
2007-01-12 12:21:44 +01:00
unknown
2cc1c4792b Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/mysqld.cc:
  Auto merged
2007-01-12 15:08:40 +04:00
unknown
5a80954670 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
mysql-test/r/join.result:
  manual merge
mysql-test/t/join.test:
  manual merge
2007-01-12 14:48:59 +04:00
unknown
cf76bb5118 Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/mysqld.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
2007-01-12 14:47:11 +04:00
unknown
cf0857d08c Bug#24660: "enum" field type definition problem
ENUMs weren't allowed to have character 0xff, a perfectly good
character in some locales.  This was circumvented by mapping 0xff in
ENUMs to ',', thereby prevent actual commas from being used. Now if
0xff makes an appearance, we find a character not used in the enum and
use that as a separator. If no such character exists, we throw an
error.

Any solution would have broken some sort of existing behaviour. This
solution should serve both fractions (those with 0xff and those with
',' in their enums), but WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE
WITH 0xff IN THEIR ENUMS. :-/ That is, mysqldump with their current
server, and restore when upgrading to one with this patch.


mysql-test/r/type_enum.result:
  Bug#24660: "enum" field type definition problem
  
  Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
  char in some locales), or ',', or both.
mysql-test/t/type_enum.test:
  Bug#24660: "enum" field type definition problem
  
  Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
  char in some locales), or ',', or both.
sql/table.cc:
  Bug#24660: "enum" field type definition problem
  
  Revert fix for Bug#20922.
sql/unireg.cc:
  Bug#24660: "enum" field type definition problem
  
  Use a field-separator for ENUM-values that is not part of those values. If impossible,
  throw error.
2007-01-12 11:06:38 +01:00
unknown
7a9892ccdd Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into  mysql.com:/home/gluh/MySQL/Merge/5.0
2007-01-12 13:58:08 +04:00
unknown
36e7e72754 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.0


sql/mysqld.cc:
  Auto merged
2007-01-12 13:57:40 +04:00
unknown
6dcad7d832 Function mysql_rm_tmp_tables():
fixed valgrind error
fixed indentation
2007-01-12 13:34:33 +04:00
unknown
4713caa7de Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-01-12 10:17:39 +01:00
unknown
3685d889e7 mysql_explain_log.sh:
Patch from Paul DuBois for better help messages


scripts/mysql_explain_log.sh:
  Patch from Paul DuBois for better help messages
2007-01-12 01:04:39 +01:00
unknown
84e8991666 Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build


configure.in:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-01-11 23:05:13 +01:00
unknown
7133bbca3d Bug rpl_row_delayed_ins.test fails in pushbuild
The test uses show binlog event which is not deterministic due to the single insert delayed
query can generate up to number of inserted rows row-events pair (table_map + Write_row)

The solution is to leave the current binlogging behaviour as it is and change 
the test as spliting arguments of insert delayed query. Note, that such fix was applied
earlier for  binlog_insert_delayed.test :
https://intranet.mysql.com/secure/apps/irclog.php?channel=22&start_time=2006-09-27 

There are no tests with insert delayed and show binlog events combination requiring
this fix.


mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
  splitting insert delayed per rows
2007-01-11 23:59:12 +02:00
unknown
cdb60578f4 Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS)
According to some internal communication, these two functions are place
holders for future enhancements. Because they use a variable number of
parameters, the implementation defined a reserved keyword for them in the
parser grammar.

Unfortunately, doing so creates a bug similar to Bug 21114 reported for the
function FORMAT.

In the 5.1 code base, due to improvements in the code implemented with bug
21114, having a reserved keyword for functions with a variable number of
arguments is not needed any more by the implementation.

As a result, this fix removes the place-holder implementation, and removes
the unnecessary reserved keywords. Should the functions UNIQUE_USERS and
GROUP_UNIQUE_USERS be finally implemented in a later release, the
implementation should sub class Create_native_func in sql/item_create.cc.
For example, see the class Create_func_concat.


BitKeeper/deleted/.del-item_uniq.cc:
  Rename: sql/item_uniq.cc -> BitKeeper/deleted/.del-item_uniq.cc
BitKeeper/deleted/.del-item_uniq.h:
  Rename: sql/item_uniq.h -> BitKeeper/deleted/.del-item_uniq.h
libmysqld/Makefile.am:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
mysql-test/r/parser.result:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
mysql-test/t/parser.test:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/Makefile.am:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/item.h:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/item_sum.h:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/lex.h:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/mysql_priv.h:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/sql_yacc.yy:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
2007-01-11 14:58:05 -07:00
unknown
44318bbbdd Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build
into  siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build


BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-README~1:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
configure.in:
  Manual merge
mysql-test/install_test_db.sh:
  Manual merge
sql/mysqld.cc:
  Manual merge
2007-01-11 13:50:48 -07:00
unknown
e64f4fdebb Merge trift2.:/MySQL/M50/tmp-5.0
into  trift2.:/MySQL/M51/push-5.1


mysys/my_read.c:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Null merge.
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Null merge.
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Null merge.
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Null merge.
BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785:
  Null merge.
scripts/make_binary_distribution.sh:
  Null merge, this change is already suppressed in 4.1.
support-files/MySQL-shared-compat.spec.sh:
  Null merge, this change is already suppressed in 4.1.
2007-01-11 20:43:43 +01:00
unknown
98cd24b32b Merge trift2.:/MySQL/M50/tmp1-5.0
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
2007-01-11 20:20:43 +01:00
unknown
c1bcbe2973 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
mysql-test/r/csv.result:
  Manual merge.
mysql-test/t/csv.test:
  Manual merge.
2007-01-11 22:15:20 +03:00
unknown
4a819ce19e Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
into  bodhi.local:/opt/local/work/mysql-5.0-runtime


sql/item_func.cc:
  Auto merged
2007-01-11 22:09:48 +03:00
unknown
6ab5bdf311 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.0-runtime


heap/hp_block.c:
  Auto merged
mysql-test/r/view.result:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
heap/hp_write.c:
  SCCS merged
2007-01-11 21:59:28 +03:00
unknown
fcbe66a366 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  bodhi.local:/opt/local/work/mysql-4.1-runtime


sql/item_func.cc:
  Auto merged
2007-01-11 21:49:52 +03:00
unknown
32c535e2d9 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
2007-01-11 19:40:05 +01:00
unknown
7f9da471cd Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B25106-5.0-opt


sql/sql_base.cc:
  Auto merged
2007-01-11 19:13:04 +02:00