fails there; until we find reason (me and possibly Konstantin).
mysql-test/t/rpl_timezone.test:
disabling test if --ps-protocol, until we find reason
sql/slave.cc:
fixing comment
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
BitKeeper/etc/logging_ok:
auto-union
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
of SET ONE_SHOT; storing tz info directly in event (if this info is needed),
it's now allowed to have different global tz on master and slave.
client/mysqlbinlog.cc:
we need MAX_TIME_ZONE_NAME_LENGTH when processing log_event.h, and it's declared in mysql_priv.h
mysql-test/r/rpl_timezone.result:
result update
mysql-test/t/rpl_timezone-slave.opt:
Now that we can have different global value of timezone on master and slave, let's test it.
mysql-test/t/rpl_timezone.test:
Tests of the new replication of timezones: checking the output of mysqlbinlog,
replication of CONVERT_TZ().
sql/ha_innodb.cc:
No very fast shutdown on Netware (anyway it's disabled on all platforms,
but this is so that we don't forget to keep it disabled on Netware in the future).
sql/log.cc:
No more need to write SET ONE_SHOT to binlog for character set and timezone
(as we store this info directly nin the Query_log_event now).
sql/log_event.cc:
Exclude ::write() methods if MYSQL_CLIENT.
Storing timezone info in the Query_log_event in master. Re-reading it in slave.
Small code cleanups. I plan to not store the end 0 of catalog in binlog
events soon.
sql/log_event.h:
replication of time zones: a place for tz info in Query_log_event,
in LAST_EVENT_INFO. Plus if we are compiling a client, we don't need
the ::write() methods, so keeping them out (of mysqlbinlog.cc;
keeping them in, resulted in problem that mysqlbinlog does not know Timezone
structure).
sql/mysql_priv.h:
moving this define from tztime.h (tztime.h has things which are
too much for a client like mysqlbinlog).
sql/set_var.cc:
It's now allowed to change global value of charset or timezone even if using binlogging
or if being a slave.
Making CONVERT_TZ(,,@@session.time_zone) replicate.
sql/set_var.h:
these ::check()s are not needed anymore (changing global charset
or timezone is now allowed even if binlogging or slave)
sql/slave.cc:
No more need to check for same global timezone if master is 5.x
(ok, strictly speaking if it is > 5.0.3 but this is alpha).
sql/slave.h:
a function to wrap settings of charset to default.
sql/tztime.cc:
Adaptation of my_tz_find() to the case where it's not called from inside
a query (i.e. cannot join its tz tables to the query's ones): this variant
opens the tz tables itself, reads from them, and closes them. This is presently
only used by the slave SQL thread (when it sets the tz before executing a query).
sql/tztime.h:
declaration of new function, plus moving symbol to mysql_priv.h
for easier usage in mysqlbinlog (Dmitri, pardon me).
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Fixed newly introduced bug in rollup
client/mysqldump.c:
Safer buffer allocation
Removed wrong assert
mysql-test/r/olap.result:
more tests
mysql-test/t/olap.test:
more tests
sql/handler.cc:
Simple cleanup
Fixed wrong check for next digit (wrong debug output)
sql/item.cc:
Replace shrink_to_length() with mark_as_const() as the former allowed one to do changes to the string
sql/item_sum.cc:
Change reference to pointer
Trivial optimzation of testing 'allways_null'
sql/mysqld.cc:
Proper indentation of comment
sql/sql_select.cc:
Fixed newly introduced bug in rollup
sql/sql_string.h:
Remove not needed 'shrink_to_length()'
Added 'mark_as_const()' to be used when one want to ensure that a string is not changed
Made --timer work
mtr_cases.pl:
Added option --reorder to get less server restarts
mysql-test-run.pl:
Added option --reorder to get less server restarts
Moved do_before_start_master() not to remove binlog files unless restarted
Made --timer work
Slave was incorrectly writing log to error log
mysql-test/mysql-test-run.pl:
Added option --reorder to get less server restarts
Moved do_before_start_master() not to remove binlog files unless restarted
Made --timer work
Slave was incorrectly writing log to error log
mysql-test/lib/mtr_cases.pl:
Added option --reorder to get less server restarts
mysql-test/lib/mtr_report.pl:
Made --timer work
innobase/include/data0type.ic:
Auto merged
mysql-test/r/endspace.result:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
support-files/mysql.spec.sh:
Manual merge.
mysql-test/r/federated.result:
made sure result has SLAVE_PORT!
mysql-test/t/federated.test:
added --replace_result to a table creation that I forgot to add before
Added a test case for bug #9210.
sql_select.cc:
Fixed bug #9210.
The function calc_group_buffer did not cover the case
when the GROUP BY expression was decimal.
Slightly optimized the other code.
sql/sql_select.cc:
Fixed bug #9210.
The function calc_group_buffer did not cover the case
when the GROUP by expression was decimal.
Slightly optimized the other code.
mysql-test/t/func_group.test:
Added a test case for bug #9210.
been killed.
mysql-test/r/kill.result:
Update results
mysql-test/t/kill.test:
Fix 'ping' to be '--ping' and make test that this is a new
connection actually test that.
mysql-test/r/sp.result:
New test case for BUG#6600.
mysql-test/t/sp.test:
New test case for BUG#6600.
sql/sp_head.cc:
Added yet another multiple result set statement to the list.
sql/sql_parse.cc:
Have to invalidate SP caches in CHECK TABLE, or it will produce very
strange results when called in SPs.
and removed a have_innodb.inc inclusion which was left by mistake
in an earlier change.
mysql-test/r/sp_trans.result:
Changed procedure name and delimiter setting to follow the style of the other SP test files.
mysql-test/t/sp-error.test:
Added comment with hint for bug test case style.
mysql-test/t/sp-threads.test:
Added comments, with hint for bug test case style.
mysql-test/t/sp.test:
Removed have_innodb.inc inclusion.
Added comments about different SP test files, table usage and
hint for bug test case style.
mysql-test/t/sp_trans.test:
Changed procedure name and delimiter setting to follow the style of the other SP test files.
Added new logic to ACL system:
1) If GRANT OPTION (not mysql db):
Ok to update existing user, but not password.
Not allowed to make a new user.
2) If UPDATE_ACL to mysql DB:
Ok to update current user, but not make a new one.
3) If INSERT_ACL to mysql DB:
Ok to add a new user, but not modify existing.
4) If GRANT OPTION to mysql DB:
All modifications OK.
mysql-test/r/grant2.result:
Added more ACL tests and fixed results in some old tests.
mysql-test/t/grant2.test:
Added more ACL tests and fixed results in some old tests.
sql/sql_acl.h:
Made check_acl_user() visible to sql_parse.cc
sql/sql_parse.cc:
Added new logic to ACL system:
1) If GRANT OPTION (not mysql db):
Ok to update existing user, but not password.
Not allowed to make a new user.
2) If UPDATE_ACL to mysql DB:
Ok to update current user, but not make a new one.
3) If INSERT_ACL to mysql DB:
Ok to add a new user, but not modify existing.
4) If GRANT OPTION to mysql DB:
All modifications OK.
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/olap.result:
Auto merged
sql/sql_select.cc:
Auto merged
BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
Auto merged
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
Auto merged
Added a test case for bug #8617.
sql_select.cc:
Fixed bug #8617.
Queries with ROLLUP and LIMIT n returned more than n rows
if SQL_CALC_FOUND_ROWS was used.
sql/sql_select.cc:
Fixed bug #8617.
Queries with ROLLUP and LIMIT n returned more than n rows
if SQL_CALC_FOUND_ROWS was used.
mysql-test/t/olap.test:
Added a test case for bug #8617.
mysql-test/r/func_gconcat.result:
Test result fixed.
sql/item_sum.cc:
Cleanup of Item_func_group_concat:
- last unobvious things commented
- don't store NULLs in the tree.
- remove unneeded variables.
- use setup_order, not setup_group to setup group concat order list
sql/item_sum.h:
Cleanup for Item_func_group_concat: remove unneded variables, methods,
move a bunch of variables to private: section.
transactional test removed
sp_trans.test, sp_trans.result:
new file
mysql-test/r/sp.result:
transactional test removed
mysql-test/t/sp.test:
transactional test removed
Update endspace.result now that InnoDB pads BLOBs properly with spaces in comparisons
mysql-test/r/endspace.result:
Update endspace.result now that InnoDB pads BLOBs properly with spaces in comparisons
Someone has fixed the calculation of length() for a returned InnoDB VARCHAR value: update endspace.result to have the correct value length('teststring') == 10
mysql-test/r/endspace.result:
Someone has fixed the calculation of length() for a returned InnoDB VARCHAR value: update endspace.result to have the correct value length('teststring') == 10
heap/hp_create.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/olap.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/key.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_string.h:
Auto merged
client/mysqldump.c:
Manual merge
mysql-test/r/func_gconcat.result:
Manual merge
mysql-test/r/func_str.result:
Manual merge
mysql-test/t/func_gconcat.test:
Manual merge
sql/ha_heap.cc:
Manual merge
sql/sql_select.cc:
Manual merge
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/handler.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/key.cc:
A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).
For "partial" key parts (e.g. key(a(20), ...) we create different
key_part->field, see sql/table.cc; so we have to use the eq()
function here to compare fields.
First one is related to Bug#7905. One should not be allowed to
create new user with password without UPDATE privilege to
MySQL database. Furthermore, executing the same GRANT statement
twice would actually crash the server and corrupt privilege database.
Other bug was that one could update a column, using the existing
value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
without SELECT privilege to the field (a in the above example)
Fixed tests grant.pl and grant2, which were wrong.
Added a test for bug #8615.
sql_select.cc:
Fixed bug #8615.
This fix only removed the cause of the reported crash.
It does not resolve other problems of rollup queries
with DISTINCT. They were fixed in the previous patch
for bug 8616.
sql/sql_select.cc:
Fixed bug #8615.
This fix only removed the cause of the reported crash.
It does not resolve other problems of rollup queries
with DISTINCT. They were fixed in the previous patch
for bug 8616.
mysql-test/t/olap.test:
Added a test for bug #8615.
mysql-test/r/olap.result:
Added a test for bug #8615.
Enabled VARCHAR testing for innodb
NOTE: innodb.test currently fails becasue of a bug in InnoDB.
I have informed Heikki about this and expect him to fix this ASAP
mysql-test/include/varchar.inc:
Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/r/innodb.result:
Added varchar tests
mysql-test/r/myisam.result:
Update results
mysql-test/t/bdb.test:
Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/t/innodb.test:
Enabled VARCHAR testing
mysql-test/t/myisam.test:
Move handler dependent tests to the specific handler (myisam, bdb, innodb)
sql/sql_parse.cc:
Indentation fixes
sql/sql_table.cc:
Fixed bug introduced when doing cleanup
into mysql.com:/home/my/mysql-5.0
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
WL#874 "Extended LOAD DATA" was pushed.
mysql-test/r/binlog.result:
Addition of two new types of binary log events shifted binlog positions.
Updated test's results and made it more robust for future similar
changes.
mysql-test/t/binlog.test:
Addition of two new types of binary log events shifted binlog positions.
Updated test's results and made it more robust for future similar
changes.
