Commit graph

60195 commits

Author SHA1 Message Date
Sergei Golubchik
bb865442a4 minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase better 2009-12-22 12:02:52 +01:00
Alexander Nozdrin
eeb39410f4 Auto-merge from mysql-next-mr. 2009-12-22 13:23:47 +03:00
Sergei Golubchik
1ad5bb1a69 WL#4738 streamline/simplify @@variable creation process
Bug#16565 mysqld --help --verbose does not order variablesBug#20413 sql_slave_skip_counter is not shown in show variables
Bug#20415 Output of mysqld --help --verbose is incomplete
Bug#25430 variable not found in SELECT @@global.ft_max_word_len;
Bug#32902 plugin variables don't know their names
Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting!
Bug#34829 No default value for variable and setting default does not raise error
Bug#34834 ? Is accepted as a valid sql mode
Bug#34878 Few variables have default value according to documentation but error occurs  
Bug#34883 ft_boolean_syntax cant be assigned from user variable to global var.
Bug#37187 `INFORMATION_SCHEMA`.`GLOBAL_VARIABLES`: inconsistent status
Bug#40988 log_output_basic.test succeeded though syntactically false.
Bug#41010 enum-style command-line options are not honoured (maria.maria-recover fails)
Bug#42103 Setting key_buffer_size to a negative value may lead to very large allocations 
Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
Bug#44797 plugins w/o command-line options have no disabling option in --help
Bug#46314 string system variables don't support expressions
Bug#46470 sys_vars.max_binlog_cache_size_basic_32 is broken
Bug#46586 When using the plugin interface the type "set" for options caused a crash.
Bug#47212 Crash in DBUG_PRINT in mysqltest.cc when trying to print octal number
Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds
Bug#49417 some complaints about mysqld --help --verbose output
Bug#49540 DEFAULT value of binlog_format isn't the default value
Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix)
Bug#49644 init_connect and \0
Bug#49645 init_slave and multi-byte characters
Bug#49646 mysql --show-warnings crashes when server dies


CMakeLists.txt:
  Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
client/mysql.cc:
  don't crash with --show-warnings when mysqld dies
config/ac-macros/plugins.m4:
  Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
include/my_getopt.h:
  comments
include/my_pthread.h:
  fix double #define
mysql-test/mysql-test-run.pl:
  run sys_vars suite by default
  properly recognize envirinment variables (e.g. MTR_MAX_SAVE_CORE) set to 0
  escape gdb command line arguments
mysql-test/suite/sys_vars/r/rpl_init_slave_func.result:
  init_slave+utf8 bug
mysql-test/suite/sys_vars/t/rpl_init_slave_func.test:
  init_slave+utf8 bug
mysys/my_getopt.c:
  Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting!
  Bug#46586 When using the plugin interface the type "set" for options caused a crash.
  Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix)
mysys/typelib.c:
  support for flagset
sql/ha_ndbcluster.cc:
  backport from telco tree
sql/item_func.cc:
  Bug#49644 init_connect and \0
  Bug#49645 init_slave and multi-byte characters
sql/sql_builtin.cc.in:
  Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
sql/sql_plugin.cc:
  Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
  Bug#32902 plugin variables don't know their names
  Bug#44797 plugins w/o command-line options have no disabling option in --help
sql/sys_vars.cc:
  all server variables are defined here
storage/myisam/ft_parser.c:
  remove unnecessary updates of param->quot
storage/myisam/ha_myisam.cc:
  myisam_* variables belong here
strings/my_vsnprintf.c:
  %o and %llx
unittest/mysys/my_vsnprintf-t.c:
  %o and %llx tests
vio/viosocket.c:
  bugfix: fix @@wait_timeout to work with socket timeouts (vs. alarm thread)
2009-12-22 10:35:56 +01:00
Alexander Nozdrin
809d309968 Auto-merge (empty) from mysql-trunk-build. 2009-12-22 09:36:04 +03:00
Alexander Nozdrin
8ed868fa1e Manual merge from mysql-next-mr.
Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc
2009-12-22 09:32:58 +03:00
Alexander Nozdrin
f238adf75d Manual merge from mysql-trunk.
Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc
2009-12-22 09:31:24 +03:00
Alexander Nozdrin
6cd0792808 Auto-merge from mysql-next-mr. 2009-12-22 08:29:03 +03:00
Mats Kindahl
6cbd760627 Merging with mysql-5.1-rep+2 2009-12-21 20:55:40 +01:00
Mats Kindahl
060e3ae739 WL#5151: Conversion between different types when replicating
Bug#49836 reports that the geometry type does not work
with WL#5151 applied.

The GEOMETRY type inherits the blob comparison function,
which read the pack length from the metadata. The GEOMETRY
type does not fill in the metadata with anything sensible,
so it is always zero, meaning that the pack length for the
source type is considered zero, rendering it always "smaller"
than the target type which has pack length 4 (without pointer).

This patch fixes the problem by defining
Field_geom::pack_length_from_metadata() to always use the
same as Field_geom::row_pack_length().
2009-12-21 19:50:25 +01:00
Alexander Nozdrin
b4565c3cf6 Null-merge default.conf from mysql-trunk-bugfixing. 2009-12-21 18:41:48 +03:00
Alexander Nozdrin
918d3d4cc7 Null-merge default.conf from mysql-next-mr. 2009-12-21 18:40:39 +03:00
Alexander Nozdrin
1f0ef431d1 Null-merge default.conf from mysql-trunk. 2009-12-21 18:40:26 +03:00
Alexander Nozdrin
9e4f62f967 Merge default.conf from mysql-trunk. 2009-12-21 18:36:59 +03:00
Alexander Nozdrin
23e70189ab Fix default.conf. 2009-12-21 18:35:38 +03:00
Mikael Ronstrom
ec93c3ed23 Force use of c-register in CAS instruction on x86-32 bit architecture, b-register used for push and pop, so don't want to give compile the chance to choose the wrong register 2009-12-21 14:08:11 +01:00
Mattias Jonsson
abb773b50f merge 2009-12-21 11:44:26 +01:00
Mattias Jonsson
287dfc1469 Bug#48737: Partitions: search fails with ucs2
Recommit of patch:
http://lists.mysql.com/commits/91400

Test case only (code part was pushes as bug-49028)

mysql-test/r/partition_column.result:
  Bug#48737: Partitions: search fails with ucs2
  
  added test case
mysql-test/t/partition_column.test:
  Bug#48737: Partitions: search fails with ucs2
  
  Added result
2009-12-21 11:38:31 +01:00
Alexander Nozdrin
a13f2adddc Auto-merge from mysql-trunk-bugfixing. 2009-12-21 13:23:41 +03:00
Alexander Nozdrin
c736665e43 Disable plugin_load.test due to Bug#42144. 2009-12-21 13:20:43 +03:00
Alfranio Correia
56ff29a422 merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 2009-12-21 06:42:23 +00:00
Alfranio Correia
c5af8813fd merge mysql-5.1-rep+2 --> mysql-5.1-rep+2-delivery1 2009-12-21 06:33:32 +00:00
Alfranio Correia
03324f6a0a Post-merge fix. 2009-12-21 06:18:11 +00:00
Vladislav Vaintroub
22c6534698 Fix inconsistently defined THR_LOCK_myisam_mmap
It was pthread_mutex_t in mi_static.c and 
mysql_mutex_t in my_thr_init.c

Solaris linker complains about different size of the 
symbol.

Fix : use mysql_mutex_t everywhere.
2009-12-20 21:20:11 +00:00
Alexander Nozdrin
2c145a94ff Auto-merge from mysql-next-mr. 2009-12-20 12:48:09 +03:00
Alexander Nozdrin
a5a2835c06 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-20 12:43:07 +03:00
Mikael Ronstrom
d4f23f0cf6 Yet one more fix for Solaris atomics in builds 2009-12-19 18:24:52 +01:00
Mikael Ronstrom
d60b5fa260 Fixed Solaris build issues 2009-12-19 17:44:45 +01:00
Mikael Ronstrom
6bcd9edc8a Post-merge fix: wait for statement result before disconnecting. Otherwise the statement might affect unrelated tests. mysql-test/t/lock_multi.test, Reap statement status 2009-12-19 13:26:00 +01:00
Mikael Ronstrom
2126212df1 Merged in latest mysql-next-mr 2009-12-19 12:50:48 +01:00
Mikael Ronstrom
a99300e264 Fixed solaris builds 2009-12-19 12:48:39 +01:00
Alexander Nozdrin
3360882025 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-19 11:38:14 +03:00
Alexander Nozdrin
a5cdaab3eb Auto-merge from mysql-next-mr. 2009-12-19 11:35:19 +03:00
Alexander Nozdrin
6ee1776ccf Auto-merge from mysql-trunk. 2009-12-19 11:33:33 +03:00
Alexander Nozdrin
02b76970c5 Auto-merge from mysql-next-mr. 2009-12-19 11:27:22 +03:00
Alexander Nozdrin
dc70b216cd Manual merge from mysql-trunk-merge (configure.in). 2009-12-19 11:22:13 +03:00
Alexander Nozdrin
8933c6f5f4 Auto-merge from mysql-trunk. 2009-12-19 11:20:21 +03:00
Mikael Ronstrom
3b103b4897 Increase probability of correct atomics implementation by choosing stable implementations first 2009-12-19 08:54:05 +01:00
Mikael Ronstrom
eddd1a94a7 Make choices of atomic implementation based on highest stability 2009-12-19 08:46:37 +01:00
Mikael Ronstrom
efc20b24fc Post-merge fix: wait for statement result before disconnecting. Otherwise the statement might affect unrelated tests. mysql-test/t/lock_multi.test, Reap statement status 2009-12-19 08:37:08 +01:00
Vladislav Vaintroub
8cffae12a6 merge 2009-12-18 22:13:56 +01:00
Vladislav Vaintroub
fef794a800 Bug #49811: inconsistent usage of SAFEMALLOC in debug compilation on windows
Remove per-project SAFEMALLOCs definitions, as they result in malloc/free mismatches.
2009-12-18 21:39:24 +01:00
Mats Kindahl
437b5338fb Merging with mysql.5.1-rep+2 2009-12-18 13:09:08 +01:00
Alfranio Correia
394b073154 Post-merge fix after BUG##45292
Updated suppressed warning messages.
2009-12-18 11:15:46 +00:00
Mats Kindahl
b001aefde8 Merging with mysql-5.1-rep+2 2009-12-18 11:16:18 +01:00
Mats Kindahl
242038c61f WL#5151: Conversion between different types
when replicating

Post-merge fixes. Updating result files.
2009-12-18 11:15:56 +01:00
Mikael Ronstrom
45e62fba06 Fixed Solaris Atomics build issues 2009-12-18 11:15:21 +01:00
Mats Kindahl
e4de9401d6 WL#5151: Conversion between different types
when replicating

The function create_virtual_tmp_table does not
set db_low_byte_first in the same way as
create_tmp_table does, causing copying from
the virtual table to a real table to get strange
values for SET types on big-endian machines.


mysql-test/extra/rpl_tests/type_conversions.test:
  Adding tests for converting between different-sized sets.
sql/sql_select.cc:
  Settng dh_low_byte_first for tables created
  with create_virtual_tmp_table.
2009-12-18 11:12:27 +01:00
Mikael Ronstrom
3ad70924c9 Added extra checks of 64-bit atomic support on GCC and Solaris, also added 64-bit support in solaris.h which was missing 2009-12-18 09:29:18 +01:00
Luis Soares
9db8801077 BUG#49259: Slave I/O thread could not register on master
The slave thread changed the format of the information it used to
connect to the master after patch for BUG 13963.  This resulted
in old master getting confused, thence rejecting the slave
connection attempt.

In particular, patch for BUG 13963 removed the rpl_recovery_rank
variable which was, at that time, packed together with the rest
of the information which the slave would use to register itself
on the master. Based on this data, the master would then assert
that the number of bytes received in the connection command was
consistent to what it was expecting. 

Therefore, given that a slave, patched with the aforementioned
patch, would not pack the four bytes related to the
rpl_recovery_rank variable, the old master would reject the
connection attempt. It would assume that the data was
inconsistent (fewer bytes than it was expecting) and return 
an error.

We fix this by faking an rpl_recovery_rank variable when
registering the slave on the master. In practice this reverts a
small part of patch for BUG 13963, the one related to the slave
connecting to the master.

sql/repl_failsafe.cc:
  Added bypassing of removed rpl_recovery_rank variable information in
  packet. This should also make more sense when old servers connect
  to a new master (ie, master with patch for BUG 13963). If this was not
  done, the new master could interpert information an old slave sends as
  master_id, when in fact it could be the rpl_recovery_rank data.
sql/slave.cc:
  Faking a rpl_recovery_rank so that we can register as a slave in
  an old master.
2009-12-18 02:54:54 +00:00
Alfranio Correia
3dadf9564c merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 2009-12-17 21:43:35 +00:00