mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49115 commits 2793 branches 343 tags 1.7 GiB
Commit graph

49115 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
joerg@trift2.
616aa41b4d Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-02 21:39:44 +02:00
joerg@trift2.
8888c54081 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-02 21:30:35 +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.
7ddc8c35b2 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-02 21:18:24 +02:00
cbell/Chuck@mysql_cab_desk.
62f8d8c64a Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1
 2007-08-02 15:15:48 -04:00
kent@kent-amd64.(none)
dc998d9388 Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build
 2007-08-02 20:59:23 +02:00
kent@mysql.com/kent-amd64.(none)
838a98c1e6 make_win_bin_dist: 
Simplified copying of 'mysql-test' directory
 2007-08-02 20:51:04 +02: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
joerg@trift2.
9bc29c8e13 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-02 20:10:27 +02:00
jperkin@production.mysql.com
0a7599a71e Merge production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-4.1 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-5.0
 2007-08-02 18:57:50 +02:00
jperkin@production.mysql.com
21cb71adb0 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-4.1
 2007-08-02 18:52:42 +02:00
jperkin@production.mysql.com
b088c6a3dc myisamchk.c: 
Fix typo in usage.
 2007-08-02 18:51:11 +02:00
istruewing@chilla.local
5ec766dbe7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug29838
 2007-08-02 16:11:27 +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
kent@mysql.com/kent-amd64.(none)
10778d6fe2 Makefile.am: 
Add CMakeLists.txt to source distribution
CMakeLists.txt:
  Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1
  Manual merge from 5.0 (bug#30118)
CMakeLists.txt, mysqlbinlog.cc, lib_sql.cc:
  No need to test on USING_CMAKE, it is the only Windows build
 2007-08-02 15:37:33 +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@mysql.com/ramil.myoffice.izhnet.ru
e8eaca54a3 After-merge fix: result adjusted. 2007-08-02 17:14:48 +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@kent-amd64.(none)
423fd0b07e Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build
 2007-08-02 12:56:54 +02: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
kostja@bodhi.(none)
ea3388f2b2 Add a test case for Bug#5719 "impossible to lock VIEW". 
It has been possible to lock a view in 5.1 for some time.
 2007-08-02 13:59:02 +04: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
joerg@trift2.
9e756ab225 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-02 11:28:11 +02:00
joerg@trift2.
9e924569d2 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-02 11:22:50 +02:00
joerg@trift2.
69b789aafd Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-02 11:18:29 +02: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
d66b4bd4be Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:41:02 -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
tsmith@ramayana.hindu.god
9d09389ccb Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2007-08-01 18:38:43 -06:00
tsmith@ramayana.hindu.god
76366d7931 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:33:07 -06:00
tsmith@ramayana.hindu.god
181da56554 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:32:39 -06:00
tsmith@ramayana.hindu.god
7509e1ed24 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:32:01 -06:00
tsmith@ramayana.hindu.god
33c4cdaa66 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:30:55 -06:00
tsmith@ramayana.hindu.god
c2399f04d0 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2007-08-01 18:30:28 -06:00
tsmith@ramayana.hindu.god
c215bd28c1 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:19:28 -06:00
tsmith@ramayana.hindu.god
4e20ec041c Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:16:23 -06:00
tsmith@ramayana.hindu.god
9ce717b0fe Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:15:24 -06:00
tsmith@ramayana.hindu.god
8575227571 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:14:50 -06:00
tsmith@ramayana.hindu.god
ffc2f3ab99 Merge ramayana.hindu.god:/home/tsmith/m/bk/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2007-08-01 18:12:44 -06:00
tsmith@ramayana.hindu.god
54254530ad Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51
 2007-08-01 17:34:20 -06:00
kostja@bodhi.(none)
d63d8cb1a3 Add a test case for Bug#18287 create federated table always times out, 
error 1159 ' ' (fixed by the patch for Bug 25679)
 2007-08-02 03:32:54 +04:00
tsmith@ramayana.hindu.god
8143040683 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 17:32:37 -06:00