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

31170 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
cdeacb3954 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-02-24 13:41:38 -08:00
unknown
7375fe240c Fix a typo in dbug printout 
sql/opt_range.cc:
  Fix a typo in dbug printout: print "min_val < partitioning_field < max_val",
  not "max_val < partitioning_field < max_val"
 2006-02-25 00:41:37 +03:00
unknown
868cc7fd44 This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support. 
BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6:
  Delete: include/raid.h
BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1:
  Delete: mysys/raid.cc
BitKeeper/deleted/.del-raid2.c~fe7aea5fb4b9748c:
  Delete: mysys/raid2.c
include/Makefile.am:
  Removing raid
include/my_sys.h:
  Removing Raid
include/myisam.h:
  Removing raid
mysql-test/r/case.result:
  Cleaned up incomming tables
mysql-test/r/mysqlcheck.result:
  new results
mysql-test/t/case.test:
  Cleaned up test
mysql-test/t/mysqlcheck.test:
  Cleaned up two tests.
mysys/Makefile.am:
  Removed raid
mysys/my_static.c:
  Removed raid
storage/myisam/mi_check.c:
  Removed raid
storage/myisam/mi_info.c:
  Removed raid bits.
 2006-02-24 13:20:51 -08:00
unknown
db8392d67d last second additions for bug#16411 
mysql-test/r/events_microsec.result:
  update results
mysql-test/t/events_microsec.test:
  use the newly introduced I_S.PROCESSLIST to check whether the scheduler is running.
 2006-02-24 15:28:20 +01:00
unknown
b1793d9c13 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16411


sql/sql_show.cc:
  Auto merged
 2006-02-24 14:14:51 +01:00
unknown
a7d13b9dbd add this file to revision control. there was not new line at the end of the file 
fix for bug#16411
 2006-02-24 14:10:24 +01:00
unknown
d587a26bfa fix for bug #16411 (microseconds are allowed) 
last fixes


sql/event_executor.cc:
  fix message
 2006-02-24 14:08:34 +01:00
unknown
4f2d6f1158 fix for bug #16411 (Microseconds are allowed for events) 
sql/event_timed.cc:
  fix problem during merge
 2006-02-24 14:02:26 +01:00
unknown
a1023b0582 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.1-new


mysql-test/t/mysqldump.test:
  Auto merged
 2006-02-24 13:56:42 +01:00
unknown
f1a8a34c6c Fix mysqldump.test to work with non-standard --vardir. 
(Backported from mysql-5.1-new)


mysql-test/t/mysqldump.test:
  Fix mysqldump.test to work with non-standard --vardir.
 2006-02-24 13:51:04 +01:00
unknown
0d1c357772 fix test result 
fix for bug #16412 (post-merge fix)


mysql-test/r/sp.result:
  fix test result
 2006-02-24 13:34:28 +01:00
unknown
d7d068ea22 merge 
mysql-test/r/events.result:
  Auto merged
sql/event.cc:
  Auto merged
sql/event.h:
  Auto merged
sql/event_executor.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/event_timed.cc:
  manual merge
 2006-02-24 12:03:32 +01:00
unknown
8fd0e70ce2 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16412


sql/sql_show.cc:
  Auto merged
 2006-02-24 11:56:16 +01:00
unknown
5f214cf216 Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information) 
WL#1034 (Internal CRON)


mysql-test/r/grant.result:
  fix result file
sql/sql_show.cc:
  Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information)
 2006-02-24 11:52:03 +01:00
unknown
4bef622585 Fix mysqldump.test to work with non-standard --vardir. 2006-02-24 10:15:39 +01:00
unknown
e16e4ff8f0 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged
 2006-02-23 13:56:00 -06:00
unknown
ef1316fadd mysqltest.c: 
Rearrange out of order options in option struct.


client/mysqltest.c:
  Rearrange out of order options in option struct.
 2006-02-23 13:54:55 -06:00
unknown
263abaebbe Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-23 11:08:16 -06:00
unknown
19ed1c4b31 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-23 11:07:56 -06:00
unknown
82b98e2701 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


sql/mysqld.cc:
  manual merge.
 2006-02-23 09:41:04 -06:00
unknown
cffde51342 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-02-23 16:27:07 +01:00
unknown
a3bc77d8de Added missing DBUG_RETURN 2006-02-23 16:25:52 +01:00
unknown
6f6552e107 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqldump.c:
  Auto merged
 2006-02-23 16:11:47 +01:00
unknown
5dd2f66eaf mysqld.cc: 
Fix out of order entries in option struct.


sql/mysqld.cc:
  Fix out of order entries in option struct.
 2006-02-23 09:11:05 -06:00
unknown
c1a0674868 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 16:10:36 +01:00
unknown
7262273457 Change snprintf to my_snprintf 
client/mysqldump.c:
  snprintf =>  my_snprintf
 2006-02-23 16:08:28 +01:00
unknown
18004dc75d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqldump.c:
  Auto merged
 2006-02-23 14:35:57 +01:00
unknown
24c44a9bea Aix52 build fix 
client/mysqldump.c:
  Declare variable in start of function
 2006-02-23 14:06:29 +01:00
unknown
cf84a09509 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/opt/local/work/mysql-5.1-new
 2006-02-23 14:19:26 +03:00
unknown
b26c3ef461 Fix an const char->char conversion error. 2006-02-23 14:18:17 +03:00
unknown
2707f13566 After merge fix 
mysql-test/t/mysqltest.test:
  Fix merge
 2006-02-23 10:57:33 +01:00
unknown
97bc92752b Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  Merge with my own merge
mysql-test/t/mysqltest.test:
  Merge
 2006-02-23 10:54:56 +01:00
unknown
1cf9f23911 Fix bad merge 2006-02-23 10:51:33 +01:00
unknown
f7295f2438 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
 2006-02-23 10:45:39 +01:00
unknown
9ae84f70cf Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge locationwhere to search for client bins
 2006-02-23 10:41:37 +01:00
unknown
9b1aa7fa07 Merge fixup 
client/mysqltest.c:
  Fix after merge, do_eval has three args
  Remove extre return in do_block
 2006-02-23 10:35:53 +01:00
unknown
c330dc839b Fix a bad merge of mine. 2006-02-23 12:32:54 +03:00
unknown
897f8eabf5 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Merge
 2006-02-23 10:30:31 +01:00
unknown
44e286d215 Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched. 
client/mysqltest.c:
  Add new parameter to 'do_eval' that will add any escape chars found in the input string to the output string. 
  This is used in 'do_system' and in 'do_exec' where only unescaped variables
  will be expanded, rest of the string will be left untouched.
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqldump.test:
  Revert previous patch that added extra \\ in "exec" command
mysql-test/t/mysqltest.test:
  Revert previous patch that added extra \\ in exec command
 2006-02-23 10:11:57 +01:00
unknown
436b498570 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
 2006-02-23 09:07:30 +01:00
unknown
50ba49988a ndb - enable rpl_ndb_blob* again, disabled by accident 
mysql-test/t/disabled.def:
  enable rpl_ndb_blob* again, disabled by accident
 2006-02-23 00:35:32 +01:00
unknown
8574fb811b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-22 23:18:45 +01:00
unknown
8535f97511 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-02-22 23:12:32 +01:00
unknown
216bc447fb rpl_row_mysqlbinlog.result, rpl_row_mysqlbinlog.test: 
Updated with echos for the results file requested by lars


mysql-test/t/rpl_row_mysqlbinlog.test:
  Updated with echos for the results file requested by lars
mysql-test/r/rpl_row_mysqlbinlog.result:
  Updated with echos for the results file requested by lars
 2006-02-22 23:11:42 +01:00
unknown
150cad6679 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-22 22:59:29 +01:00
unknown
871335f587 ndb - ndb_restore.test: fix backup id in result 
mysql-test/r/ndb_restore.result:
  fix backup id using jeb's ndb_backup.inc
mysql-test/t/ndb_restore.test:
  fix backup id using jeb's ndb_backup.inc
 2006-02-22 22:04:46 +01:00
unknown
89d572549d New test for wl2321 
mysql-test/t/rpl_row_mysqlbinlog.test:
  New mysqlbinlog test for row based binlogs per lars request for WL#2321
mysql-test/t/rpl_row_mysqlbinlog-master.opt:
  New mysqlbinlog test for row based binlogs per lars request for WL#2321
mysql-test/r/rpl_row_mysqlbinlog.result:
  New mysqlbinlog result WL#2321
 2006-02-22 22:03:55 +01:00
unknown
9233f62f5a Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-02-22 21:27:46 +01:00
unknown
5e02bec9ce Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1


sql/share/errmsg.txt:
  Auto merged
 2006-02-22 14:18:45 -06:00
unknown
ef5d68f339 BUG# 17393: Partitions: Wrong error message when assigning too many subpartitions 
We changed the error message to more clearly reflect the fact
that we are counting parts and subparts


mysql-test/r/partition_mgm_err.result:
  updated error message
sql/share/errmsg.txt:
  updated error message
 2006-02-22 14:17:11 -06:00