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

31644 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
5513aaa37c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug17494
 2006-03-02 10:05:24 +01:00
unknown
24052d674a Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16406


sql/event_timed.cc:
  Auto merged
 2006-03-02 10:03:48 +01:00
unknown
c46518086b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.mrg
 2006-03-02 12:36:56 +04:00
unknown
cc3358cfef Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.9088
 2006-03-02 12:35:42 +04:00
unknown
306621137a Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.9088
 2006-03-02 12:34:05 +04:00
unknown
38657e1bfc Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug11527
 2006-03-02 09:33:05 +01:00
unknown
3d96d86695 Bug#14527: Partitions: table unreadable if partition name = c-cedilla 
sql_partition.cc:
  Changeing THD charset to utf8 when parsing a frm file.
partition_charset.test, partition_charset.result:
  new file


sql/sql_partition.cc:
  Bug#14527: Partitions: table unreadable if partition name = c-cedilla
  Changering THD charset to utf8 when parsing
  a frm file.
 2006-03-02 12:25:02 +04:00
unknown
7e2a9aa459 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.16315
 2006-03-02 11:44:12 +04:00
unknown
e371dcb675 fixed order by in test 2006-03-02 08:44:11 +01:00
unknown
843e9e6551 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-02 08:34:21 +01:00
unknown
526d28f36a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.16315


sql/item_xmlfunc.cc:
  Auto merged
mysql-test/r/xml.result:
  After merge fix
mysql-test/t/xml.test:
  After merge fix
 2006-03-02 10:42:08 +04:00
unknown
6513ddab4d Merge mysql.com:/home/hf/work/mysql-5.0.9088 
into mysql.com:/home/hf/work/mysql-5.1.mrg


mysql-test/r/bigint.result:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
 2006-03-02 09:17:11 +04:00
unknown
ffa7f9439a Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  SCCS merged
 2006-03-01 18:51:33 -06:00
unknown
35bb42d315 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
 2006-03-01 18:44:44 -06:00
unknown
564c1d64f6 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-03-01 18:39:18 -06:00
unknown
5f95aa48d9 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  Auto merged
 2006-03-01 18:38:19 -06:00
unknown
aa9a497d7a README: 
revise README.


mysql-test/README:
  revise README.
 2006-03-01 18:37:41 -06:00
unknown
0b09fa04c2 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-03-01 17:57:47 -06:00
unknown
5b9669ccda Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
 2006-03-01 17:55:41 -06:00
unknown
79faaddce7 README.gcov: 
Revise README.gcov.


mysql-test/README.gcov:
  Revise README.gcov.
 2006-03-01 17:55:10 -06:00
unknown
8d7f8929f5 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-03-01 17:48:17 -06:00
unknown
6f6205287d Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  Auto merged
 2006-03-01 17:41:34 -06:00
unknown
10f230539f Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1


mysql-test/README:
  Auto merged
 2006-03-01 17:37:49 -06:00
unknown
7526342706 README: 
Revise mysql-test README.


mysql-test/README:
  Revise mysql-test README.
 2006-03-01 17:37:07 -06:00
unknown
5d40b535c5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1


mysql-test/mysql-test-run.sh:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2006-03-01 21:39:43 +01:00
unknown
a28368f2c2 for every deprecated feature say when it will be removed. 
restore CREATE TABLE ... TYPE=engine until 5.2
 2006-03-01 21:36:05 +01:00
unknown
e4bec46e2a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-01 21:20:26 +01:00
unknown
c351b5bf38 Bug#17279 user with no global privs and with create priv in db can create database 
- Fix test case for systems with "lowercase names" 


mysql-test/r/grant2.result:
  Update test result
mysql-test/t/grant2.test:
  Fix for system with "lowercase names", allow erro 1007 to be returned
 2006-03-01 21:19:23 +01:00
unknown
da7087ddb3 Bug#17368 General log and slow query log don't work 
- Add "storage/csv" to directories to be copied


scripts/make_win_src_distribution.sh:
  Add "storage/csv" to directories to be copied(removed duplicated storage/example)
 2006-03-01 21:10:30 +01:00
unknown
720e13d665 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/M40/comment-4.0
 2006-03-01 20:13:23 +01:00
unknown
601a442863 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
 2006-03-01 18:24:07 +01:00
unknown
62f7005a3d Bug #17827 cluster: rename of several tables in one statement, gets multiply logged 
- redo log table query for log, split into separate entries per rename, to avoid duplicates, also to only log renames that relate to ndb tables


sql/ha_ndbcluster_binlog.h:
  Bug #17827  	cluster: rename of several tables in one statement, gets multiply logged
 2006-03-01 18:23:00 +01:00
unknown
79f8690871 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug11527
 2006-03-01 17:44:32 +01:00
unknown
eaaaa760e6 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/comment-4.1


mysql-test/mysql-test-run.sh:
  Auto merged
 2006-03-01 17:43:16 +01:00
unknown
605c82d2a8 BUG#17783: Removed redundant ctype_cp932_notembedded.test in 5.1 
This test is being performed by:
1. ctype_cp932_binlog_row.test  and  2. ctype_cp932_binlog_stm.test
Both of these source the file extra/binlog_tests/ctype_cp932_binlog.test


BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
  Delete: mysql-test/t/ctype_cp932_notembedded.test
BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3:
  Delete: mysql-test/r/ctype_cp932_notembedded.result
 2006-03-01 17:31:43 +01:00
unknown
5af68d301d Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin 
into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-bug-17523
 2006-03-01 17:27:39 +01:00
unknown
3b4f9680f6 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug11527
 2006-03-01 17:21:09 +01:00
unknown
52d34999fb BUG#17782: Incorrect result file 
mysql-test/r/binlog_row_insert_select.result:
  Corrected result file
 2006-03-01 17:09:39 +01:00
unknown
7d0a9613ad Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-01 16:54:08 +01:00
unknown
a636ec4dec some tests depends on umask 
mysql-test/mysql-test-run.sh:
  binlog_stm_mix_innodb_my depends on umask
 2006-03-01 16:53:21 +01:00
unknown
fc6557dfa2 BUG#17780: Incorrect result file. (Test for that part is extra/binlog_tests/binlog_row_ctype_cp932.test) 
mysql-test/r/binlog_row_ctype_cp932.result:
  Corrected result file
 2006-03-01 16:48:13 +01:00
unknown
372455220e Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug11527
 2006-03-01 16:45:01 +01:00
unknown
265df624cc fix for bug #16413 (Events: statements don't appear in the general query log) 
WL#1034


mysql-test/t/events_logs_tests-master.opt:
  Rename: mysql-test/t/events_slow_query-master.opt -> mysql-test/t/events_logs_tests-master.opt
sql/event_timed.cc:
  ask the anonymous SP to log general statements
sql/sp_head.cc:
  save the OPTION_LOG_OFF and restore it after execution
sql/sp_head.h:
  add a new flag for general log
mysql-test/r/events_logs_tests.result:
  update result file
mysql-test/t/events_logs_tests.test:
  add test for general log
 2006-03-01 16:27:57 +01:00
unknown
c3ca791de3 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


sql/sql_db.cc:
  Auto merged
strings/decimal.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
 2006-03-01 15:49:50 +01:00
unknown
7407e6ee6c Merge shellback.(none):/home/msvensson/mysql/bug17728/my51-bug17728 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-01 15:44:07 +01:00
unknown
65225c3ea9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-01 15:43:57 +01:00
unknown
924330bab4 Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin 
into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-dbg
 2006-03-01 15:43:57 +01:00
unknown
ea6f479b45 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2006-03-01 15:43:56 +01:00
unknown
774b9cb56a Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-03-01 08:43:56 -06:00
unknown
292c79679c Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-17523
 2006-03-01 16:43:56 +02:00