mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49442 commits 2784 branches 343 tags 1.6 GiB
Commit graph

49442 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@trift2.
b30fbfd3ca Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 23:47:31 +02:00
joerg@trift2.
d7c1a81136 Merge trift2.:/MySQL/M50/netware2-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 23:40:36 +02:00
joerg@trift2.
ae77f187f5 Merge trift2.:/MySQL/M51/netware2-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 23:29:19 +02:00
joerg@trift2.
4d375e46e3 Merge trift2.:/MySQL/M50/netware2-5.0 
into  trift2.:/MySQL/M51/netware2-5.1
 2007-08-24 23:12:19 +02:00
joerg@trift2.
2fd45aaee6 Fixes for the NetWare builds, discovered during 5.1.21-beta and backported to 5.0: 
1) Ensure "init_db.sql" and "test_db-sql" really get built.

2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories.
 2007-08-24 23:07:59 +02:00
malff/marcsql@weblab.(none)
1013eb57ce Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-cleanup
 2007-08-24 09:09:19 -06:00
malff/marcsql@weblab.(none)
162a1be4f9 Whitespace cleanup 2007-08-24 09:08:11 -06:00
jani@a88-113-38-195.elisa-laajakaista.fi
76835dbaae Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-24 15:26:48 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
b25dacbdee Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-24 15:25:02 +03:00
dfischer/mysqldev@production.mysql.com
81528c1a00 Merge bk-internal:/home/bk/mysql-5.0-build 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-24 13:47:11 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
b356018839 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-08-24 14:43:33 +03:00
dfischer/mysqldev@mysql.com/production.mysql.com
74afbb4b7b Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-24 13:30:16 +02:00
joerg@trift2.
9e33d39aeb Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 13:03:22 +02:00
joerg@trift2.
08d0b2ba9b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 12:41:09 +02:00
joerg@trift2.
c5b1ad99e4 Merge trift2.:/MySQL/M51/target-5.1.22 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 12:38:26 +02:00
joerg@trift2.
e8aa23fae4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 12:34:45 +02:00
joerg@trift2.
268ce5eb7e Merge trift2.:/MySQL/M51/tmp-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 12:28:47 +02:00
joerg@trift2.
30433c29eb Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 11:09:18 +02:00
joerg@trift2.
17c6d765a5 Merge trift2.:/MySQL/pushed/netware-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 11:02:34 +02:00
joerg@trift2.
76a05d26d5 Merge trift2.:/MySQL/pushed/netware-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 10:58:14 +02:00
joerg@trift2.
e9b971610f Merge trift2.:/MySQL/pushed/netware-5.0 
into  trift2.:/MySQL/pushed/netware-5.1
 2007-08-24 10:50:11 +02:00
joerg@trift2.
aa588114a2 NetWare packages were missing the scripts to initialize the database: add them. 2007-08-24 10:47:13 +02:00
df@pippilotta.erinye.com
66158ad912 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-24 10:14:08 +02:00
df@pippilotta.erinye.com
6d068a5ac7 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-24 10:13:03 +02:00
df@pippilotta.erinye.com
30435b43f2 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-24 09:55:47 +02:00
thek@adventure.(none)
1e43e5402a Merge adventure.(none):/home/thek/Development/cpp/bug28285/my51-bug28285 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-08-24 09:44:22 +02:00
holyfoot/hf@hfmain.(none)
c4811d67f7 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28430/my51-28430
 2007-08-24 07:51:58 +05:00
gshchepa@bk-internal.mysql.com
64bcb0daaf Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-08-23 23:27:30 +02:00
gshchepa@bk-internal.mysql.com
46e58466cb Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/users/gshchepa/mysql-5.1-opt
 2007-08-23 21:38:24 +02:00
gshchepa@bk-internal.mysql.com
c70dbeab8b Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/users/gshchepa/mysql-5.0-opt
 2007-08-23 21:28:33 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
afe7de8234 Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format. 
In the ha_partition::position() we didn't calculate the number
of the partition of the record. We used m_last_part value instead,
relying on that it is set in other place like previous call of a method
like ::write_row(). In replication we don't call any of these befor
position(). Delete_rows_log_event::do_exec_row calls find_and_fetch_row.
In case of InnoDB-based PARTITION table, we have HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
enabled, so use position() / rnd_pos() calls to fetch the record.

Fixed by adding partition_id calculation to the ha_partition::position()
 2007-08-23 23:34:48 +05:00
joerg@trift2.
f7ddcd3efe Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-23 19:58:42 +02:00
joerg@trift2.
53114c7073 Merge trift2.:/MySQL/M50/netware-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-23 19:47:42 +02:00
joerg@trift2.
c82475ca72 Merge trift2.:/MySQL/M51/netware-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-23 19:43:21 +02:00
joerg@trift2.
df891775ad Merge trift2.:/MySQL/M50/netware-5.0 
into  trift2.:/MySQL/M51/netware-5.1
 2007-08-23 18:46:07 +02:00
df@pippilotta.erinye.com
07c6ef515d Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-marvel 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48
 2007-08-23 17:43:47 +02:00
df@pippilotta.erinye.com
08a53d0d5f Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-opt 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48
 2007-08-23 17:43:15 +02:00
tomas@whalegate.ndb.mysql.com
eea05b726f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
 2007-08-23 16:25:35 +02:00
gshchepa/uchum@gleb.loc
1e7fe52dbb Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-23 19:24:18 +05:00
tomas@whalegate.ndb.mysql.com
8fb593b840 BUG#30017 log-slave-updates incorrect behavior for cluster 
- let the receiving injector thread decide what to do
(recommit for 5.1.22 target)
 2007-08-23 16:13:21 +02:00
thek@adventure.(none)
ddb2ce8f22 Bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 
Test case contains possible race conditions. This patch fixes these race
conditions and also adjust the test to execute according to its documentation.
 2007-08-23 15:37:55 +02:00
jmiller/ndbdev@ndb08.mysql.com
af68cdb2a8 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 
into  mysql.com:/data1/mysql-5.1-target-5.1.22
 2007-08-23 15:33:05 +02:00
tomas@whalegate.ndb.mysql.com
749b40612e BUG#30134 restore of backup from different endian can work for timestamp column 
(recommit for 5.1.22 target)
 2007-08-23 15:17:44 +02:00
malff/marcsql@weblab.(none)
e13d5cc335 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-cleanup 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-cleanup
 2007-08-22 18:29:38 -06:00
malff/marcsql@weblab.(none)
7a1942d2e1 Do not use $static_link for GCOV builds, 
since this flag was explicitly removed in pushbuild for GCOV builds.

 BUILD_CMD => ['sh', '-c', 'perl -i.bak -pe "s/ \\\\\$static_link//" ' .
              'BUILD/compile-pentium-gcov; BUILD/compile-pentium-gcov'],

Moving $static_link to SETUP.sh broke this, and is now fixed.

Should this flag be needed on some platforms,
the proper location is compile-<platform>-gcov

Tested the amd64 and pentium64 build fine without it, and can run NDB tests.
 2007-08-22 18:11:01 -06:00
malff/marcsql@weblab.(none)
81114a7208 Bug#30333 (Performance, expressions lists in the parser) 
Before this patch, the parser would execute:
- Select->expr_list.push_front()
- Select->expr_list.pop()
when parsing expressions lists, in the following rules:
- udf_expr_list
- expr_list
- ident_list

This is unnecessary, and introduces overhead due to the memory allocations
performed with Select->expr_list

With this patch, this code has been removed.
The list being parsed is maintained in the parser stack instead.

Also, 'udf_expr_list' has been renamed 'opt_udf_expr_list', since this
production can be empty.
 2007-08-22 15:38:32 -06:00
malff/marcsql@weblab.(none)
b1e0dcc09f Manual merge 2007-08-22 14:25:36 -06:00
joerg@trift2.
18b8e7a33f Cleanup in the "netware" subdirectory: 
1) We do not provide the "isam" table handler in 5.0 and up (different from "myisam" !),
   so we do not need the ".def" files for the "isam"-specific tools.

2) Use "basename" to get the base name of a file, not a harder-to-read sed expression.
 2007-08-22 22:04:31 +02:00
malff/marcsql@weblab.(none)
74bbe20546 Manual merge 2007-08-22 12:02:23 -06:00
joerg@trift2.
94e9aa8eb1 Merge trift2.:/MySQL/M51/target-5.1.22 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-22 19:52:30 +02:00