kostja@bodhi.(none)
b2716c0dad
Doxygen warnings.
2007-08-16 19:52:55 +04:00
kostja@bodhi.(none)
97adcb6054
Fix doxygen warning.
2007-08-16 18:07:48 +04:00
kostja@bodhi.(none)
86946eb6a8
Fix doxygen warning (declaration and definition mismatch).
2007-08-16 17:59:12 +04:00
kostja@bodhi.(none)
4f97c96eb2
Add replication group (comments).
2007-08-15 20:11:16 +04:00
kostja@bodhi.(none)
2537a87fb5
Provide initial module structure to Doxygen.
2007-08-15 19:08:44 +04:00
kostja@bodhi.(none)
46b8a07dc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-15 17:46:20 +04:00
kostja@bodhi.(none)
91fe15bb9d
Fix doxygen warnings.
2007-08-15 17:43:08 +04:00
malff/marcsql@weblab.(none)
f5dc545cb1
Changed whitespace and indentation only, no logic change.
2007-08-14 20:31:06 -06:00
kostja@bodhi.(none)
a3b210d408
Apply patch for Bug#27806 table comments not passed in to storage engine
...
during "CREATE ... LIKE ..."
Only affects engine writers.
No change in server behaviour.
2007-08-08 14:02:07 +04:00
kostja@bodhi.(none)
b4eb961fef
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-08 11:45:13 +04:00
kostja@bodhi.(none)
3c6eb0002d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-08-08 11:34:35 +04:00
kostja@bodhi.(none)
ec5464d2e0
A fix and a test case for Bug#29306 "Truncated data in MS Access with decimal (3,1) columns in a
...
VIEW".
mysql_list_fields() C API function would incorrectly set MYSQL_FIELD::decimals
member for some view columns.
The problem was in an incomplete implementation of
Item_ident_for_show::make_field(), which is responsible for view
columns metadata.
2007-08-06 14:22:24 +04:00
df@pippilotta.erinye.com
17e76114c9
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-08-05 16:37:34 +02:00
df@pippilotta.erinye.com
f0f9652988
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-08-04 11:08:11 +02:00
df@pippilotta.erinye.com
d268c7e0fc
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-08-04 00:44:51 +02:00
kent@kent-amd64.(none)
6b9ac5b7cf
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
...
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-03 22:57:21 +02:00
df@pippilotta.erinye.com
eba0752b45
after-merge fix
2007-08-03 22:02:19 +02:00
kent@mysql.com/kent-amd64.(none)
a6d082f36d
CMakeLists.txt, README, configure.js
...
Several adjustments to make client libraries pass the link test
on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
2007-08-03 21:51:37 +02:00
mkindahl@dl145h.mysql.com
ea9848094a
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
2007-08-03 18:59:16 +02:00
df@pippilotta.erinye.com
493634e4c7
Merge bk-internal:/home/bk/mysql-5.1-marvel
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
2007-08-03 17:15:23 +02:00
mkindahl@dl145h.mysql.com
6cc184aa1b
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2007-08-03 17:14:46 +02:00
mkindahl@dl145h.mysql.com
008d2b2537
Fixes to eliminate valgrind warnings.
2007-08-03 17:12:00 +02:00
df@pippilotta.erinye.com
3d986fde8d
Merge bk-internal:/home/bk/mysql-5.1-engines
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
2007-08-03 16:53:06 +02:00
bar@bar.myoffice.izhnet.ru
fb8dff9721
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875
...
into mysql.com:/home/bar/mysql-work/mysql-5.1.b28875
2007-08-03 17:16:02 +05:00
bar@bar.myoffice.izhnet.ru
c01ce7b1e3
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875
...
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
2007-08-03 15:30:31 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
4eebfd09c2
Bug#28875 Conversion between ASCII and LATIN1 charsets does not function
...
(Regression, caused by a patch for the bug 22646).
Problem: when result type of date_format() was changed from
binary string to character string, mixing date_format()
with a ascii column in CONCAT() stopped to work.
Fix:
- adding "repertoire" flag into DTCollation class,
to mark items which can return only pure ASCII strings.
- allow character set conversion from pure ASCII to other character sets.
2007-08-03 15:25:23 +05:00
gluh@mysql.com/eagle.(none)
481cb830d1
powermacg5 problem fix
...
we need a copy of I_S name because the name can be changed in case of lowercase_table_name!=0
2007-08-03 14:17:51 +05:00
joerg@trift2.
d63f8f48fb
Re-apply fixes originally made by Kent,
...
they got lost because of a merge conflict with the CMakeLists.txt
dependency fix (numer 29982 in our bugs DB).
These changes are for bug#30118.
2007-08-03 11:06:53 +02:00
monty@mysql.com/nosik.monty.fi
113cd2d064
Removed compiler warning
2007-08-03 08:08:33 +03:00
cbell/Chuck@mysql_cab_desk.
f42cf05ad4
WL#3228 (NDB) : RBR using different table defs on slave/master
...
This patch removes a portion of the last patch to Field_blob::copy
after problems found during testing of tests using distinct operations.
2007-08-02 21:18:41 -04:00
monty@mysql.com/nosik.monty.fi
237d586700
Simplify logging code a bit (to make code smaller and faster)
...
Moved duplicated code to inline function store_timestamp()
Save thd->time_zone_used when logging to table as CSV internally cases it to be changed
Added MYSQL_LOCK_IGNORE_FLUSH to log tables to avoid deadlock in case of flush tables.
Mark log tables with TIMESTAMP_NO_AUTO_SET to avoid automatic timestamping
Set TABLE->no_replicate on open
2007-08-03 01:14:27 +03:00
gluh@mysql.com/eagle.(none)
27ab885525
WL#3732 Information schema optimization
2007-08-03 03:14:05 +05:00
cbell/Chuck@mysql_cab_desk.
e8aff50790
WL#3228 (NDB) : RBR using different table defs on slave/master
...
This patch corrects a problem found during testing on Solaris. The code
changes how length values are retrieved on big endian machines. The
patch allows the rpl_extraColmaster tests to run on these machines.
2007-08-02 16:15:52 -04:00
joerg@trift2.
0bd847f013
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into trift2.:/MySQL/M50/push-5.0
2007-08-02 21:49:42 +02:00
cbell/Chuck@mysql_cab_desk.
dc2cab6561
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1
...
into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge
2007-08-02 15:27:47 -04:00
joerg@trift2.
c9e9d735af
Merge trift2.:/MySQL/M51/bug29982-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-08-02 20:19:21 +02:00
svoj@april.(none)
0f9cae4843
Merge mysql.com:/home/svoj/devel/mysql/BUG29152/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG29152/mysql-5.1-engines
2007-08-02 19:08:39 +05:00
kent@kent-amd64.(none)
b976f18c1b
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
2007-08-02 15:39:34 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
0d9301585b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b30088/b30088.5.0
2007-08-02 18:23:23 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
7512856c31
Merge mysql.com:/home/ram/work/b30088/b30088.5.0
...
into mysql.com:/home/ram/work/b30088/b30088.5.1
2007-08-02 16:56:32 +05:00
kent@mysql.com/kent-amd64.(none)
74267ad9b8
CMakeLists.txt (several), make_win_bin_dist:
...
Aligned client library build and use with the Unix version when it
comes to what source to include directly in the builds, and what
libraries to link with (bug#30118).
Also reviewed, corrected and made more clear when static or dynamic
Thread Local Storage is to be used. Some code duplication was removed,
and some redundant library usage were removed, reducing the risk of
incorrect TLS usage.
2007-08-02 12:49:27 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
54ddf93240
Merge mysql.com:/home/ram/work/b30200/b30200.5.0
...
into mysql.com:/home/ram/work/b30200/b30200.5.1
2007-08-02 15:26:52 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
dc84a5fd52
Fix for bug #30200 : mysqlbinlog.test: connection_id() not restored under ps-protocol
...
Problem: thd->thread_specific_used flag is not set executing a statement
containig connection_id() function using PS protocol, that leads to
improper binlog event creation.
Fix: set the flag in the Item_func_connection_id::fix_fields().
2007-08-02 14:51:03 +05:00
tsmith@ramayana.hindu.god
0f6f44424f
Post-merge fix. Update some test results, and add an InnoDB-only
...
compatibility hook, thd_mark_transaction_to_rollback().
2007-08-02 02:22:31 -06:00
monty@mysql.com/nosik.monty.fi
0174fa66d5
Don't save & restore time fields from thd when it's not needed.
...
Added back setting of 'some_tables_deleted' to not cause deadlocks in mysql_lock_table()
2007-08-02 10:50:00 +03:00
monty@nosik.monty.fi
93f0771fca
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-08-02 07:55:33 +03:00
monty@mysql.com/nosik.monty.fi
4f33d95fa3
Set --debug-check if one uses DBUG_PUSH in all clients
...
Fixed bug in query cache that made it impossible to run mysqld with --debug
Fixed memory leaks in mysqldump and mysqltest
Memory leaks associated with wrong usage of mysqltest is not fixed. To find these, run
mysql-test-run --debug mysqltest
2007-08-02 07:49:29 +03:00
tsmith@ramayana.hindu.god
b13de9343f
Merge 50 -> 51 (-opt changesets)
2007-08-01 18:59:41 -06:00
tsmith@ramayana.hindu.god
a52a078f75
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:40:02 -06:00
tsmith@ramayana.hindu.god
534c3f325d
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:39:13 -06:00