libmysql/libmysql.c:
Extended comments for mysql_stmt_init, mysql_stmt_prepare,
mysql_stmt_result_metadata.
Few bits of code moved around and cleaned up.
sql/sql_prepare.cc:
Commented case with ulonglong length in get_param_length
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
into mysql.com:/home/mysql_src/mysql-4.1
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
(Note: This affects only comments, not variable names.)
extra/perror.c:
Fix skipp -> skip once and for all.
heap/hp_hash.c:
Fix skipp -> skip once and for all.
isam/_dynrec.c:
Fix skipp -> skip once and for all.
isam/isamchk.c:
Fix skipp -> skip once and for all.
isam/isamlog.c:
Fix skipp -> skip once and for all.
isam/pack_isam.c:
Fix skipp -> skip once and for all.
isam/test1.c:
Fix skipp -> skip once and for all.
merge/mrg_open.c:
Fix skipp -> skip once and for all.
myisam/mi_check.c:
Fix skipp -> skip once and for all.
myisam/mi_delete.c:
Fix skipp -> skip once and for all.
myisam/mi_key.c:
Fix skipp -> skip once and for all.
myisam/mi_search.c:
Fix skipp -> skip once and for all.
myisam/myisamlog.c:
Fix skipp -> skip once and for all.
mysys/ChangeLog:
Fix skipp -> skip once and for all.
mysys/default.c:
Fix skipp -> skip once and for all.
mysys/mf_iocache.c:
Fix skipp -> skip once and for all.
mysys/mf_iocache2.c:
Fix skipp -> skip once and for all.
mysys/mf_pack.c:
Fix skipp -> skip once and for all.
mysys/mf_soundex.c:
Fix skipp -> skip once and for all.
mysys/mf_wfile.c:
Fix skipp -> skip once and for all.
mysys/my_error.c:
Fix skipp -> skip once and for all.
mysys/my_getwd.c:
Fix skipp -> skip once and for all.
scripts/mysql_find_rows.sh:
Fix skipp -> skip once and for all.
sql/sql_yacc.yy:
Fix skipp -> skip once and for all.
sql/time.cc:
Fix skipp -> skip once and for all.
strings/ctype-big5.c:
Fix skipp -> skip once and for all.
strings/ctype-gbk.c:
Fix skipp -> skip once and for all.
strings/ctype-tis620.c:
Fix skipp -> skip once and for all.
myisam/rt_index.c:
Auto merged
myisam/rt_index.h:
Auto merged
myisam/rt_mbr.c:
Auto merged
myisam/rt_mbr.h:
Auto merged
myisam/rt_split.c:
Auto merged
myisam/rt_test.c:
Auto merged
sql/spatial.cc:
Auto merged
innobase/os/os0file.c:
after merge fix
sql/ha_innodb.cc:
after merge fix
sql/sql_select.cc:
after merge fix (The patch for 4.0 didn't make sence in 4.1)
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/README:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysys/mf_wcomp.c:
Auto merged
mysys/mf_wfile.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
configure.in:
Get changes for netware
include/my_sys.h:
Use local file
innobase/include/os0file.h:
auto merge
innobase/os/os0file.c:
auto merge
sql/mysqld.cc:
auto merge
sql/sql_acl.cc:
indentation change
sql/sql_acl.h:
use local file
sql/sql_class.h:
auto merge
sql/sql_db.cc:
use local file
sql/sql_parse.cc:
use local file
sql/sql_select.cc:
Merge
sql/sql_show.cc:
use local file
libmysqld/Makefile.am:
Removed define that is now defined by configure and my_global.h
mysql-test/r/func_gconcat.result:
Fixed test result after removing end space
sql/share/romanian/errmsg.txt:
Fixed wrong error message
sql/sql_insert.cc:
Removed compiler warning
Fixed serbian error messages
Fix for windows regarding changed variable name
configure.in:
Update version number
Added serbian error messages
libmysqld/libmysqld.def:
Fix changed variable names
mysql-test/t/func_gconcat.test:
remove some \r
sql/share/serbian/errmsg.txt:
Added missing error messages
Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
sql/ha_innodb.cc:
Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
innobase/include/row0mysql.h:
Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
innobase/row/row0mysql.c:
Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
will disable warnings, --log-warnings will increment warning level by one, or the
level can be given as an optional argument. Default level is 1.
Changed aborted connection warning to be logged only if the level is > 1.
sql/sql_class.h:
Changed boolean into ulong.
sql/sql_parse.cc:
Changed aborted connection warning to be logged only if the level is > 1.
result": new Item_param member for use in val_str()
sql/item.cc:
Fix for Bug#3796:
- return str_value_ptr from val_str to prevent modifications of parameter
value.
sql/item.h:
Fix for bug#3796:
- Item::val_str() method semantics documented
- new member of Item_param
tests/client_test.c:
Test case for bug #3796 added. A few compile-time warnings removed.
empty recordset where some records should be found)
sql/ha_myisam.cc:
Code simplified with vio_ok()
sql/mysqld.cc:
vio_ok used
sql/slave.cc:
vio_ok used
sql/sql_class.cc:
Here is the place of the error - we should not examine net.vio in
embedded library
sql/sql_class.h:
method added to always return TRUE in embedded library, and to
sheck thd.net.vio otherwise
sql/sql_show.cc:
code simplified with vio_ok()
--with-geometry and
--with-embedded-privilege-control
configure switches added
acconfig.h:
necessary lines added
myisam/mi_open.c:
#include added
mysql-test/t/gis-rtree.test:
test modified to take HAVE_GEOMETRY in account
mysql-test/t/gis.test:
test modified to take HAVE_GEOMETRY in account
sql/mysql_priv.h:
option's variables added
sql/mysqld.cc:
option's handling added
sql/set_var.cc:
option's descriptions added
produce hex digits in lower case). (fixed version)
Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.
client/mysql.cc:
Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
call.
client/mysqladmin.c:
Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
call.
dbug/dbug.c:
_dig_vec became _dig_vec_upper.
include/m_string.h:
_dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower.
my_itoa()/my_ltoa() functions were removed because they were never used in our code.
int2str() now has one more argument which controls case of digits it will produce.
include/my_global.h:
my_itoa()/my_ltoa() functions were removed because they were never used in our code.
isam/isamchk.c:
Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
call.
libmysql/libmysql.def:
_dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower.
myisam/myisamchk.c:
Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str()
call.
mysys/mf_tempfile.c:
_dig_vec became _dig_vec_upper.
mysys/my_error.c:
Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
call.
mysys/my_tempnam.c:
_dig_vec became _dig_vec_upper.
sql-common/client.c:
Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str()
call.
sql/item_strfunc.cc:
_dig_vec became _dig_vec_upper. Also we don't need hex[] array in this file now because we
have _dig_vec_lower instead.
sql/mysqld.cc:
Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
call.
sql/password.c:
_dig_vec became _dig_vec_upper.
sql/sql_bitmap.h:
_dig_vec became _dig_vec_upper.
strings/int2str.c:
Replaced _dig_vec by _dig_vec_upper/_dig_vec_lower pair.
int2str() now has one more argument which controls case of digits it will produce.
my_itoa()/my_ltoa() functions were removed because they were never used in our code.
strings/longlong2str-x86.s:
_dig_vec became _dig_vec_upper.
strings/longlong2str.c:
_dig_vec became _dig_vec_upper.
strings/my_vsnprintf.c:
If my_snprintf() is printing %x argument it should produce lower case hexadecimal digits
to be snprintf() compatible.
myisam/mi_create.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/rt_test.c:
Auto merged
myisam/sp_test.c:
Auto merged
sql/spatial.cc:
Auto merged
sql/spatial.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
myisam/mi_range.c:
merging
myisam/mi_rnext.c:
merging
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/log0log.ic:
Auto merged
innobase/include/mtr0mtr.h:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/que/que0que.c:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
VC++Files/innobase/innobase.dsp:
non-existent file removed
client/mysql.cc:
local opt_max_allowed_packet and opt_net_buffer_length introduced
client/mysqldump.c:
local opt_max_allowed_packet and opt_net_buffer_length introduced
include/mysql.h:
mysql_get_parameters() interface added
#define max_allowed_packet added
include/mysql_com.h:
these should not be exported
libmysql/libmysql.c:
mysql_get_parameters implementations
libmysql/libmysql.def:
interface changed
libmysql_r/Makefile.am:
MYSQL_CLIENT define added
libmysqld/lib_sql.cc:
line moved to be above the '#include "mysql.cc"'
libmysqld/libmysqld.c:
mysql_get_parameters implementation (embedded)
libmysqld/libmysqld.def:
interface changed
sql/log_event.cc:
should be like that in this case
tools/mysqlmanager.c:
compiler warns on this line
Applied patches for Netware
innobase/include/os0thread.h:
Applied patches for Netware
innobase/os/os0thread.c:
Applied patches for Netware
libmysql/libmysql.c:
Applied patches for Netware
libmysql/libmysql.def:
Applied patches for Netware
myisam/myisamchk.c:
Applied patches for Netware
Changed prototype of killed_ptr() to make it more portable
myisam/myisamdef.h:
Applied patches for Netware
Changed prototype of killed_ptr() to make it more portable
mysql-test/t/rpl_relayspace-slave.opt:
Applied patches for Netware
mysys/my_pthread.c:
Applied patches for Netware
mysys/my_static.h:
Portability fix
netware/BUILD/compile-linux-tools:
Applied patches for Netware
Changed prototype of killed_ptr() to make it more portable
netware/BUILD/mwenv:
Applied patches for Netware
Changed prototype of killed_ptr() to make it more portable
netware/BUILD/nwbootstrap:
Applied patches for Netware
Changed prototype of killed_ptr() to make it more portable
netware/my_manage.c:
Applied patches for Netware
Changed prototype of killed_ptr() to make it more portable
netware/mysql_fix_privilege_tables.pl:
Applied patches for Netware
Changed prototype of killed_ptr() to make it more portable
netware/mysql_test_run.c:
Applied patches for Netware
Changed prototype of killed_ptr() to make it more portable
netware/static_init_db.sql:
Applied patches for Netware
Changed prototype of killed_ptr() to make it more portable
scripts/make_binary_distribution.sh:
Applied patches for Netware
Changed prototype of killed_ptr() to make it more portable
sql/filesort.cc:
Changed prototype of killed_ptr() to make it more portable
sql/ha_myisam.cc:
Changed prototype of killed_ptr() to make it more portable
sql/mysqld.cc:
Fixed some typos for Netware
sql/sql_bitmap.h:
Applied patches for Netware
sql/sql_class.h:
Changed prototype of killed_ptr() to make it more portable
sql/sql_insert.cc:
safety fix
strings/my_strtoll10.c:
Added comment
mysql-test/r/ndb_autodiscover.result:
Removed one test that needs manual interaction
Added order by in some places
mysql-test/t/ndb_autodiscover.test:
Removed one test that needs manual interaction
Added order by in some places
sql/ha_ndbcluster.cc:
Using HA_WRONG_ASCII_ORDER to activate filesort on a not "sorted" ordered index.
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/examples/ha_archive.cc:
Added in example information from testing archive with Slashdot's comments.
sql/handler.h:
Fixed broken merge.
sql/set_var.cc:
Adding in "have_archive" to variables shown to make tests work.
configure.in:
Auto merged
Build-tools/Do-compile:
Auto merged
client/mysql.cc:
Auto merged
client/mysqladmin.c:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/thr_alarm.h:
Auto merged
innobase/include/trx0roll.h:
Auto merged
innobase/include/trx0trx.h:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
innobase/trx/trx0roll.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/usr/usr0sess.c:
Auto merged
isam/isamchk.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysys/default.c:
Auto merged
mysys/my_getopt.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_pthread.c:
Auto merged
netware/Makefile.am:
Auto merged
netware/init_db.sql:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
tools/mysqlmanager.c:
Auto merged
VC++Files/dbug/dbug.dsp:
Auto merged
VC++Files/heap/heap.dsp:
Auto merged
VC++Files/isam/isam.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/myisam/myisam.dsp:
Auto merged
VC++Files/myisammrg/myisammrg.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
merge
client/mysqlbinlog.cc:
merge
extra/perror.c:
merge
include/mysql_com.h:
merge
libmysqld/Makefile.am:
merge
netware/BUILD/mwenv:
merge
sql/mysqld.cc:
merge
into mysql.com:/tmp/skr99/mysql-4.0
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysqld.cc:
Auto merged
Build-tools/Do-compile:
Fixed indentation
configure.in:
Added patches from Novell
Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS
extra/perror.c:
Fixed error number reporting to not report 'Unknown error'
include/my_global.h:
Defines to make NETWARE patches cleaner
include/thr_alarm.h:
Fixed wrong macro
netware/mysql_install_db.c:
Indentation fix
Updated ndb_ test cases
mysql-test/r/ndb_autodiscover.result:
Updated to new output of error message
mysql-test/r/ndb_basic.result:
Added som order by to sort the result correctly before comparing
mysql-test/r/ndb_index_unique.result:
Added test for USING HASH combined with PRIMARY KEY and UNIQUE index
mysql-test/t/ndb_autodiscover.test:
Correctede error case
mysql-test/t/ndb_basic.test:
Added som order by
mysql-test/t/ndb_index_unique.test:
Added test for USING HASH combined with PRIMARY KEY and UNIQUE index
sql/ha_ndbcluster.cc:
Added the index flag HA_ONLY_WHOLE_INDEX if index is created with USING HASH.
