mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49252 commits 2781 branches 343 tags 1.6 GiB
Commit graph

49252 commits

This branch
This branch
All branches
Author SHA1 Message Date
gshchepa/uchum@gleb.loc
92eb485fe2 Many files: 
Post-merge fix.
 2007-08-03 13:07:37 +05:00
dfischer@bk-internal.mysql.com
74c18252c6 README.txt-1: 
Rename: mysql-test/suite/funcs_1/README.txt -> mysql-test/suite/funcs_1/README.txt-1
README.txt:
  Rename: BitKeeper/deleted/.del-README.txt -> mysql-test/suite/funcs_1/README.txt
README.txt-old-delete:
  Rename: mysql-test/suite/funcs_1/README.txt -> mysql-test/suite/funcs_1/README.txt-old-delete
README.txt:
  Rename: mysql-test/suite/funcs_1/README.txt-1 -> mysql-test/suite/funcs_1/README.txt
.del-README.txt-old-delete:
  Delete: mysql-test/suite/funcs_1/README.txt-old-delete
 2007-08-03 09:52:55 +02:00
anozdrin/alik@ibm.
e76351df1a Fix for BUG#30123: mysqldump is unable to work with old servers. 
New server (as of 5.1.21) provides new features:
  - SHOW CREATE TRIGGER;
  - character set information for SHOW TRIGGERS and SHOW CREATE
    EVENT | FUNCTION | PROCEDURE statements.
Mysqldump uses these features to generate proper dump.

The bug happened when new mysqldump was used to dump older servers.
The problem was that 5.1.21 new features are not available, so
mysqldump exited with error code or just crashed.

The fix is to detect if mysqldump has ben run against older server
and don't use new 5.1.21 functionality in this case. Certainly,
the dump generated for the older server suffers from the character
set problems fixed by BUG#16291 and the like.
 2007-08-03 11:50:17 +04:00
gkodinov/kgeorge@magare.gmz
c076b6c126 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30193-5.0-opt
 2007-08-03 10:47:41 +03:00
gkodinov/kgeorge@magare.gmz
dfcd9b7418 Merge magare.gmz:/home/kgeorge/mysql/work/B30193-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B30193-5.1-opt
 2007-08-03 10:44:09 +03:00
joerg@trift2.
88fedd69d5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-03 09:16:12 +02:00
istruewing@chilla.local
cbaa0c9300 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-08-03 08:53:23 +02:00
istruewing@chilla.local
81cb7300f8 Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-08-03 08:51:47 +02:00
monty@mysql.com/nosik.monty.fi
113cd2d064 Removed compiler warning 2007-08-03 08:08:33 +03:00
istruewing@chilla.local
7f7fbb92a2 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-08-03 06:58:28 +02:00
istruewing@chilla.local
91e9aeb88d Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-08-03 06:56:04 +02: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
gshchepa/uchum@gleb.loc
d933b0b4a0 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-03 02:15:21 +05:00
gshchepa/uchum@gleb.loc
176a20f22b Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-03 02:05:10 +05:00
gshchepa/uchum@gleb.loc
58f697f55a Merge gleb.loc:/home/uchum/work/bk/5.0-opt-27352 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-03 02:03:01 +05:00
gshchepa/uchum@gleb.loc
b63f8f8985 Fixed bug #27352. 
The SELECT query with more than 31 nested dependent SELECT queries returned
wrong result.

New error message has been added: ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT.
It will be reported as: "Too high level of nesting for select".
 2007-08-03 01:58:21 +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.
f6e5c4db58 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-02 22:15:09 +02:00
joerg@trift2.
52f71ecc67 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-02 22:11:49 +02:00
joerg@trift2.
7c6a0cf03f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  trift2.:/MySQL/M41/push-4.1
 2007-08-02 22:09:52 +02:00
istruewing@chilla.local
aefe1ff468 Merge chilla.local:/home/mydev/mysql-4.1-amain 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-08-02 22:04:01 +02:00
joerg@trift2.
3ba813fe4e Limit stack size of the server to 1 MB. 
Manual transfer of the fix for bug#20815 from 5.0 to 5.1
 2007-08-02 21:59:26 +02:00
joerg@trift2.
98dd364c71 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-02 21:52:48 +02: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
igor@olga.mysql.com
cf39429295 Fixed bug#28404. 
This patch adds cost estimation for the queries with ORDER BY / GROUP BY
and LIMIT. 
If there was a ref/range access to the table whose rows were required
to be ordered in the result set the optimizer always employed this access
though a scan by a different index that was compatible with the required 
order could be cheaper to produce the first L rows of the result set.
Now for such queries the optimizer makes a choice between the cheapest
ref/range accesses not compatible with the given order and index scans
compatible with it.
 2007-08-02 12:45:56 -07: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
evgen@moonbone.local
e9eb6309fb mysqld.cc: 
Post merge changes.
 2007-08-02 23:08:52 +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
evgen@moonbone.local
2943ddc61e sql_class.h: 
After merge changes.
 2007-08-02 21:49:27 +04:00
istruewing@chilla.local
b0d9d99bef Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug29838
 2007-08-02 19:20:09 +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
cmiller@zippy.cornsilk.net
c9ffb4c1cb Merge zippy.cornsilk.net:/home/cmiller/work/mysql/.deleted/mysql-5.1-new-maint--bug27894 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-08-02 12:51:49 -04:00
jperkin@production.mysql.com
b088c6a3dc myisamchk.c: 
Fix typo in usage.
 2007-08-02 18:51:11 +02:00
evgen@moonbone.local
0f500567f7 Merge moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-08-02 20:30:06 +04:00
evgen@moonbone.local
9c8673de05 Merge moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-08-02 18:42:56 +04:00
gkodinov/kgeorge@magare.gmz
fed7ee340b Bug #30193: crash during drop table and kill 
When DROP TABLE detects that it has been killed
by another thread it must unlock the table names
it locked.

Fixed by backporting the 5.1 error handling code.
 2007-08-02 17:11:35 +03: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