Commit graph

49124 commits

Author SHA1 Message Date
istruewing@chilla.local
edc859ffe1 Merge chilla.local:/home/mydev/mysql-5.0-ateam
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-28 11:45:31 +02:00
holyfoot/hf@hfmain.(none)
351f30d861 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/hf/work/29878/my51-29878
2007-07-28 14:11:34 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
ce2410dd1e rpl_session_var.test fixed to not depend on mysql_test_run parameters 2007-07-28 14:10:56 +05:00
istruewing@chilla.local
a5981b9556 Backported mi_test_all.sh from 5.1. 2007-07-28 10:25:50 +02:00
baker@bk-internal.mysql.com
78da884eec Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-07-28 09:16:35 +02:00
gkodinov/kgeorge@magare.gmz
51f8aa9615 show_check.result:
Addendum to thr fix for bug 30000:
  show procedure/function code defined only in debug builds
show_check.test:
  Addendum to thr fix for bug 30000: 
  show procedure/function code defined only in debug builds
2007-07-28 08:42:43 +03:00
ramil/ram@ramil.myoffice.izhnet.ru
8e6761034d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b29980/b29980.5.1
2007-07-28 10:40:11 +05:00
cbell/Chuck@mysql_cab_desk.
06df6fc137 WL#3915 : (NDB) master's cols > slave
Patch corrects minor test anomolies and build warnings.
2007-07-27 23:11:36 -04:00
tsmith@ramayana.hindu.god
60b6716bcd Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/51-b29992
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-07-27 17:27:08 -06:00
tsmith@ramayana.hindu.god
091f6a4677 Bug #29992: syslog error logging does not flush
Don't use syslog by default; user will have to request it explicitly with the --syslog option.

Use "sed -u" to get unbuffered output from sed, if it's supported.

Otherwise, don't use sed at all - don't strip the timestamp from mysqld messages.

Also, add new --syslog-tag=FOO option, which adds "-FOO" to the tag used when logging messages to syslog (i.e., mysqld-FOO or mysqld_safe-FOO)

Also, explicitly mention where log messages are going, so user can more easily find them.

Also, check if 'logger' is in the PATH, and log to the error log file if it can't be found.
2007-07-27 17:20:43 -06:00
iggy@alf.(none)
3e7caa131c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  alf.(none):/src/bug30103/my50-bug30103
2007-07-27 17:44:43 -04:00
iggy@alf.(none)
b853f4d1fe Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  alf.(none):/src/bug30103/my51-bug30103
2007-07-27 17:43:38 -04:00
iggy@alf.(none)
95b545dba0 Bug#30103 CMake build solution does not remove auto-generated resources
- Add CMake rule to remove files.
- Manual merge.
2007-07-27 17:41:34 -04:00
iggy@alf.(none)
4aad516c64 Merge alf.(none):/src/bug30103/my50-bug30103
into  alf.(none):/src/bug30103/my51-bug30103
2007-07-27 17:36:30 -04:00
cbell/Chuck@mysql_cab_desk.
b87fc5c5d4 WL#3915 : (NDB) master's cols > slave
Minor change to fix compile problems on 64-bit.
2007-07-27 16:58:23 -04:00
holyfoot/hf@hfmain.(none)
e4f4a46f76 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/29878/my50-29878
2007-07-28 01:33:03 +05:00
holyfoot/hf@hfmain.(none)
642b0c00ed Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/29878/my51-29878
2007-07-28 00:50:17 +05:00
cbell/Chuck@mysql_cab_desk.
b373c3e987 Merge mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3228_ndb
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-ndb-push
2007-07-27 15:19:05 -04:00
cbell/Chuck@mysql_cab_desk.
b02302f849 Merge mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3228_ndb
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3915_ndb
2007-07-27 15:05:29 -04:00
jperkin@production.mysql.com
88ef9a4214 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0
2007-07-27 20:49:23 +02:00
jperkin@production.mysql.com
7731aad613 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0
2007-07-27 20:47:30 +02:00
cbell/Chuck@mysql_cab_desk.
6509b5b48a WL#3915 : (NDB) master's cols > slave
Slave starts accepting and handling rows of master's tables which have more columns.
The most important part of implementation is how to caclulate the amount of bytes to
skip for unknown by slave column.

To solve that issue this WL adopts results of WL#3228 which introduces an addon to
table_map event that carries the necessary part of information about sizes of data of columns.

mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@stripped, 2007-07-26 21:31:54-04:00, cbell@mysql_cab_desk. +393 -0
WL#3915  master's cols > slave

basic tests checking altering and skipping extra fields by slave.
The fields can be of any possible types.
2007-07-27 14:45:57 -04:00
jperkin@production.mysql.com
61a1e17260 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1
2007-07-27 20:43:34 +02:00
cbell/Chuck@mysql_cab_desk.
17c2da8c2b WL#3228 (NDB) : RBR using different table defs on slave/master
This patch adds the ability to store extra field metadata in the table
map event. This data can include pack_length() or field_lenght() for
fields such as CHAR or VARCHAR enabling developers to add code that
can check for compatibilty between master and slave columns. More 
importantly, the extra field metadata can be used to store data from the
master correctly should a VARCHAR field on the master be <= 255 bytes 
while the same field on the slave is > 255 bytes. '

The patch also includes the needed changes to unpack to ensure that data
which is smaller on the master can be unpacked correctly on the slave.
2007-07-27 14:38:36 -04:00
malff/marcsql@weblab.(none)
db7af023c0 manual merge 2007-07-27 12:30:02 -06:00
jperkin@production.mysql.com
87a297061c Merge production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.0
into  production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.1
2007-07-27 20:28:34 +02:00
malff/marcsql@weblab.(none)
32668a2e08 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25422-d
2007-07-27 12:22:00 -06:00
malff/marcsql@weblab.(none)
ac7b17eac4 Code review changes 2007-07-27 12:19:36 -06:00
cbell/Chuck@mysql_cab_desk.
74e4da489e WL#3228 (NDB) : RBR using different table defs on slave/master
This patch adds the ability to store extra field metadata in the table
map event. This data can include pack_length() or field_lenght() for
fields such as CHAR or VARCHAR enabling developers to add code that
can check for compatibilty between master and slave columns. More 
importantly, the extra field metadata can be used to store data from the
master correctly should a VARCHAR field on the master be <= 255 bytes 
while the same field on the slave is > 255 bytes. '

The patch also includes the needed changes to unpack to ensure that data
which is smaller on the master can be unpacked correctly on the slave.
2007-07-27 13:58:37 -04:00
anozdrin/alik@ibm.
47345bd04f Fix merge. 2007-07-27 21:50:37 +04:00
holyfoot/hf@hfmain.(none)
37dece087e Merge mysql.com:/home/hf/work/29878/my50-29878
into  mysql.com:/home/hf/work/29878/my51-29878
2007-07-27 22:43:33 +05:00
dkatz@damien-katzs-computer.local
32fce0e17e Merge damien-katzs-computer.local:/Users/dkatz/50_hpux
into  damien-katzs-computer.local:/Users/dkatz/mysql51
2007-07-27 13:41:11 -04:00
anozdrin/alik@ibm.
af9e57562d Merge ibm.:/home/alik/Documents/MySQL/devel/5.0-rt
into  ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merge
2007-07-27 21:30:43 +04:00
df@pippilotta.erinye.com
50e7239d7b BUG#20815 for the 5.1 branch 2007-07-27 19:14:08 +02:00
anozdrin/alik@ibm.
04047d9666 Fix test so that it will be environment-independent. 2007-07-27 21:06:50 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
bc15820d32 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b29980/b29980.5.1
2007-07-27 21:17:05 +05:00
serg@janus.mylan
0967e88790 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-07-27 18:08:09 +02:00
iggy@alf.(none)
667f2a35de Bug#30103 CMake build solution does not remove auto-generated resources
- Add CMake rule to remove files.
2007-07-27 11:54:54 -04:00
kent@mysql.com/kent-amd64.(none)
519ebab04e SSL/Makefile.am mysql-test/Makefile.am:
Moved CERT files to where they are used, avoids conflict
  between two make files trying to install the same CERTs
SSL/*.pem, 
  Move: SSL/*.pem -> mysql-test/std_data/
2007-07-27 17:39:07 +02:00
thek@adventure.(none)
8f5fad2c34 Merge adventure.(none):/home/thek/Development/cpp/bug29929/my50-bug29929
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-07-27 17:32:45 +02:00
thek@adventure.(none)
5ab7da9167 Merge adventure.(none):/home/thek/Development/cpp/bug29929/my50-bug29929
into  adventure.(none):/home/thek/Development/cpp/bug29929/my51-bug29929
2007-07-27 16:59:09 +02:00
gkodinov/kgeorge@magare.gmz
092f9d2e55 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B30000-5.1-opt
2007-07-27 17:57:29 +03:00
thek@adventure.(none)
889b4ebcee Bug #29929 LOCK TABLES does not pre-lock tables used in triggers of the locked tables
When a table was explicitly locked with LOCK TABLES no associated
tables from any related trigger on the subject table were locked.
As a result of this the user could experience unexpected locking
behavior and statement failures similar to "failed: 1100: Table'xx'
was not locked with LOCK TABLES".

This patch fixes this problem by making sure triggers are
pre-loaded on any statement if the subject table was explicitly
locked with LOCK TABLES.
2007-07-27 16:56:29 +02:00
gkodinov/kgeorge@magare.gmz
9e1dd00ff2 Bug #30000: SHOW commands once again ends up in the
slow query log
Disable the SHOW commands to appear in the show query
log.
Update the commands type array.
2007-07-27 17:55:39 +03:00
gkodinov/kgeorge@magare.gmz
e9be3793fb fixing the 5.1-opt merge of the fix for bug 29571:
cannot check the statments in the binlog for row based 
replication.
2007-07-27 17:29:48 +03:00
anozdrin/alik@ibm.
e73f004fe6 Fix for BUG#30027: mysqldump does not dump views properly.
mysqldump generates view defitions in two stages:

  - dump CREATE TABLE statements for the temporary tables.  For each view a
    temporary table, that has the same structure as the view is created.

  - dump DROP TABLE statements for the temporary tables and CREATE VIEW
    statements for the view.

This approach is required because views can have dependencies on each other
(a view can use other views). So, they should be created in the particular
order. mysqldump however is not smart enough, so in order to resolve
dependencies it creates temporary tables first of all.

The problem was that mysqldump might have generated incorrect dump for the
temporary table when a view has non-ASCII column name. That happened when
default-character-set is not utf8.

The fix is to:

  1. Switch character_set_client for the mysqldump's connection to binary
     before issuing SHOW FIELDS statement in order to avoid conversion.
    
  2. Dump switch character_set_client statements to UTF8 and back for
     CREATE TABLE statement that is issued to create temporary table.
2007-07-27 18:20:17 +04:00
joerg@debian.(none)
808a534d11 Merge mysqldev@production.mysql.com:my/mysql-5.1-funcs1-dep
into  debian.(none):/M51/omer-5.1
2007-07-27 16:13:07 +02:00
joerg/mysqldev@production.mysql.com
0dad584179 Merge mysql.com:/data0/mysqldev/my/mysql-5.1
into  mysql.com:/data0/mysqldev/my/mysql-5.1-funcs1-dep
2007-07-27 16:06:50 +02:00
joerg/mysqldev@mysql.com/production.mysql.com
4d279aa9df Merge mysql.com:/data0/mysqldev/my/mysql-5.1
into  mysql.com:/data0/mysqldev/my/mysql-5.1-funcs1-dep
2007-07-27 15:59:18 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
03dfd986d7 Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.
Item_func_user doesn't calculate anything in it's val_str() method,
just returns saved str_value.
Though Item::save_in_field method can destroy str_value, relying on
val_str() return. As a result we get the garbage stored in field.

We cannot use Item::save_in_field implementation for Item_func_user,
reimplement it in simpler way.
2007-07-27 18:42:25 +05:00