mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41636 commits 2776 branches 343 tags 1.6 GiB
Commit graph

12471 commits

Author SHA1 Message Date
mskold/marty@linux.site
10f8e9fbb8 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-12-15 09:06:15 +01:00
mskold/marty@mysql.com/linux.site
532fe009b8 bug#19956 Problems with VARCHAR primary key and BLOB fields:added test case 2006-12-15 09:03:21 +01:00
bar@bar.intranet.mysql.r18.ru
f29b2bea7a Merge mysql.com:/usr/home/bar/mysql-5.0.b22645 
into  mysql.com:/usr/home/bar/mysql-5.1.b22645
 2006-12-14 16:45:48 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
cedafa8dec Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/usr/home/bar/mysql-5.0.b22645
 2006-12-14 14:19:30 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
ba6529d7dd Bug#17642 mysqlbinlog: Restore from row-based binlog fails 
Problem: mysqlbinlog_base64 failed sporadically.

Reason: Missing "flush logs" before running $MYSQL_BINLOG,
which could start dumping the log file before server
has finished writting into it.
Fix:
- implementing --force-if-open option to "mysqlbinlog"
- adding --disable-force-if-open to make $MYSQL_BINLOG
  fail on non-closed log files, to garantee that nobody
  will forget "flush logs" in the future.
- adding "flush logs" into all affected tests.
 2006-12-14 14:05:25 +04:00
svoj@mysql.com/april.(none)
a708a3b5a6 After merge fix. 2006-12-13 19:20:34 +04:00
svoj@april.(none)
35e7dea871 Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.1-engines
 2006-12-13 17:32:40 +04:00
svoj@mysql.com/april.(none)
db88cf3df7 Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines
 2006-12-13 16:29:33 +04:00
svoj@mysql.com/april.(none)
f92ae8d6c1 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines
 2006-12-13 15:53:37 +04:00
patg@radha.local
cd32c0b948 WL# 3031 
Found that the results from select had to be fixed too.
 2006-12-12 19:39:45 -05:00
patg@radha.myhome.westell.com
0cab9beb75 WL# 3031 
Added --replace-result to avoid hard-coding of port
 2006-12-12 13:18:49 -05:00
gluh@gluh.(none)
c6d9cf1b12 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2006-12-12 17:59:34 +04:00
gluh@mysql.com/gluh.(none)
118a0c7fe2 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2006-12-12 14:01:06 +04:00
patg@radha.myhome.westell.com
b892f9adf8 WL #3031 
* New result files due to new error message/error numbers
* Fixed system_mysql_db tests to work with servers table
* Added UTF8 charset to table defs
 2006-12-11 11:44:03 -05:00
bar@bar.intranet.mysql.r18.ru
bd8cf7a134 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  mysql.com:/usr/home/bar/mysql-5.1.b20396v2
 2006-12-11 17:13:53 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
c4d1d10e4b after merge fix for bug N20396 2006-12-11 17:08:10 +04:00
mats@romeo.(none)
bba84e754d Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl
 2006-12-11 13:05:11 +01:00
mats@romeo.(none)
600dc1813d Merging with mysql-5.1-new-rpl 2006-12-11 12:22:21 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
531cae29de After merge fix for bug N20396 2006-12-11 15:08:04 +04:00
patg@govinda.patg.net
ca65d01701 WL #3031 
Change to test results, committing so I can clone to another box to complete merge.
 2006-12-09 13:33:26 -05:00
patg@govinda.patg.net
f9097b86af Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge
 2006-12-08 22:30:18 -05:00
patg@govinda.patg.net
98062f567d WL# 3031 
Post-commit issues fixed
* Test results for other tests fixed due to added error #s
* Memory allocation/free issues found with running with valgrind
* Fix to mysql-test-run shell script to run federated_server test (installs
mysql.servers table properly)
 2006-12-08 22:19:51 -05:00
lars@black.(none)
d85ca0dc1d Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-12-08 23:41:29 +01:00
lars@mysql.com/black.(none)
e2e3f0e5c3 Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-12-08 23:33:39 +01:00
jonas@perch.ndb.mysql.com
11edb43a37 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-08 22:18:59 +01:00
rafal@quant.(none)
dc57928573 Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl 
into  quant.(none):/ext/mysql/bk/mysql-5.0-bug24507
 2006-12-08 16:50:06 +01:00
istruewing@chilla.local
05dde1f311 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-08 15:55:56 +01:00
bar@bar.intranet.mysql.r18.ru
6e5bd8a7f8 Merge mysql.com:/usr/home/bar/mysql-5.0.b24158 
into  mysql.com:/usr/home/bar/mysql-5.1.b20396
 2006-12-08 16:15:43 +04:00
holyfoot/hf@deer.(none)
edfbcc12cb Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/embt/my51-embt
 2006-12-08 15:49:43 +04:00
istruewing@chilla.local
df2b93439f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-08 12:28:21 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
3df9fde7aa Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/usr/home/bar/mysql-5.0.b24158
 2006-12-08 15:18:03 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
c57bde5ff1 After merge fix 2006-12-08 15:13:12 +04:00
rafal@quant.(none)
fe2d5c59c2 Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl 
into  quant.(none):/ext/mysql/bk/mysql-5.0-bug24507
 2006-12-08 11:47:48 +01:00
bar@bar.intranet.mysql.r18.ru
864ad7daa0 After merge fix 2006-12-08 10:33:05 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
0d4b26fa71 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/usr/home/bar/mysql-5.0.b20396
 2006-12-08 09:48:46 +04:00
mskold/marty@mysql.com/linux.site
6b4b402977 Bug#24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld: Re-generated test result 2006-12-07 16:27:38 +01:00
mskold/marty@linux.site
c39c7b6f2b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-07 16:08:14 +01:00
mskold/marty@linux.site
8ca573857f Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-12-07 16:03:31 +01:00
mskold/marty@mysql.com/linux.site
84a8d1759b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-12-07 15:54:43 +01:00
mskold/marty@mysql.com/linux.site
8fa5f366f7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-12-07 15:51:16 +01:00
mskold/marty@mysql.com/linux.site
93fda180d1 Bug#24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld: Added test case 2006-12-07 15:49:59 +01:00
svoj@mysql.com/april.(none)
e17d7bce00 BUG#23404 - ROW_FORMAT=FIXED option is lost is an index is added to the 
table

ROW_FORMAT option is lost during CREATE/DROP INDEX.

This fix forces CREATE/DROP INDEX to retain ROW_FORMAT by instructing
mysql_alter_table() that ROW_FORMAT is not used during creating/dropping
indexes.
 2006-12-07 18:32:40 +04:00
cbell/Chuck@suse.vabb.com
ab2d6dcd65 Merge suse.vabb.com:/home/Chuck/development/mysql-5.1-new-rpl 
into  suse.vabb.com:/home/Chuck/development/mysql-5.1_WL_3618
 2006-12-07 09:19:56 -05:00
cbell/Chuck@suse.vabb.com
9f36c1c286 WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code. 
Please see worklog for details on files changed.
 2006-12-07 09:18:35 -05:00
holyfoot/hf@deer.(none)
883aa8d980 Merge mysql.com:/home/hf/work/pfix/my50-pfix 
into  mysql.com:/home/hf/work/pfix/my51-pfix
 2006-12-07 15:23:39 +04:00
holyfoot/hf@mysql.com/deer.(none)
4f0c9c431c merging fix 2006-12-07 15:22:43 +04:00
holyfoot/hf@mysql.com/deer.(none)
41bd03c370 merging 2006-12-07 13:38:16 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
b66f34bd19 Bug#22645 LC_TIME_NAMES: Statement not replicated 
Implementing event based replication of LC_TIME_NAMES for 5.0
(as a replacement of previously made ONE_SHOT replication)
 2006-12-07 09:31:53 +04:00
holyfoot/hf@deer.(none)
dfff2c27bc Merge mysql.com:/home/hf/work/22372/my50-22372 
into  mysql.com:/home/hf/work/22372/my51-22372
 2006-12-07 09:27:47 +04:00
holyfoot/hf@mysql.com/deer.(none)
9203d43427 merging 2006-12-07 09:11:56 +04:00