database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-09 11:41:36 +03:00
Code Activity
46,939 Commits 3,266 Branches 1,096 Tags
016bff8adcc2332772b51f8dbdc5a3d926f5a04c
Commit Graph

18065 Commits

Author SHA1 Message Date
msvensson@neptunus.(none)
d4d675a6e2 mysql_fix_priviileg_tables.sql might be in share/ but not in $path_share 
since that is where  the lang files etc are
 2006-11-23 21:12:50 +01:00
anozdrin/alik@booka.
ea47e05f3c Fix for BUG##24415: Instance manager test im_daemon_life_cycle 
fails randomly.

The problem was that the test case used command line tool (mysql)
without specifying connect_timeout argument. In some cases,
this lead to hanging of the test case.

The fix is to specify --connect_timeout=1 when starting mysql.

Also, the patch contains polishing and various cleanups to simplify
analyzing of the problems further.

The patch affects only test suite, no server codebase has been
touched.
 2006-11-23 22:55:36 +03:00
msvensson@neptunus.(none)
91c3698aba Convert one more opt_source_dist 2006-11-23 20:08:48 +01:00
msvensson@neptunus.(none)
0e4d97edf0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-23 18:38:27 +01:00
msvensson@neptunus.(none)
54649b06a3 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-23 18:23:35 +01:00
msvensson@neptunus.(none)
8c2efdf4bd Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-23 18:19:54 +01:00
monty@mysql.com/nosik.monty.fi
501333f694 Added option --mtr-build-thread to mysql-test-run.pl 
Load shared libraries from zlib (fixed that mysql-test-run.pl didn't work on some Solaris boxes)
Added connect timeout to test to make im_daemon_life_cycle more predictable
 2006-11-23 18:39:10 +02:00
msvensson@neptunus.(none)
cdbc79b500 Make source_dist a "local" global variable 
And it's not an "opt"
 2006-11-23 17:30:32 +01:00
msvensson@neptunus.(none)
8f85eaf925 Remove duplicate "$report_features" 2006-11-23 17:26:06 +01:00
monty@mysql.com/nosik.monty.fi
fb9bb62b1e Added some missing DBUG_RETURN 
Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()
 2006-11-23 16:41:21 +02:00
msvensson@neptunus.(none)
c76adf6021 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-23 11:57:18 +01:00
msvensson@neptunus.(none)
d3b4712bad Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-23 11:54:25 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d6f06d4245 after-merge fix-up. 2006-11-22 17:59:46 +04:00
andrey@example.com
2a148b400d Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/bug24396/my51
 2006-11-22 14:11:11 +01:00
andrey@example.com
35238085d6 fix for bug#24396 2006-11-22 14:06:59 +01:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-22 14:11:36 +02:00
gkodinov/kgeorge@macbook.gmz
9004d93b44 Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.1 
into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
 2006-11-22 12:48:29 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
8512b7e5bd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
 2006-11-22 14:06:37 +04:00
ramil/ram@myoffice.izhnet.ru
abfd0285d2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug21789/my51-bug21789
 2006-11-22 13:41:33 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
802f7fc366 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
 2006-11-22 12:40:15 +04:00
ramil/ram@myoffice.izhnet.ru
d40abd8738 Merge mysql.com:/usr/home/ram/work/bug21789/my50-bug21789 
into  mysql.com:/usr/home/ram/work/bug21789/my51-bug21789
 2006-11-22 12:13:09 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b11dba2f0b Merge mysql.com:/usr/home/ram/work/bug21789/my41-bug21789 
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
 2006-11-22 12:10:18 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
711b6a63be Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
 2006-11-22 10:52:44 +04:00
ramil/ram@myoffice.izhnet.ru
38c04fb528 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
 2006-11-22 10:49:24 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c6e856de10 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug22029/my41-bug22029
 2006-11-22 10:30:46 +04:00
iggy@rolltop.ignatz42.dyndns.org
1917e12506 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799
 2006-11-22 01:27:44 -05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b1a423d9f6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
 2006-11-22 10:27:11 +04:00
iggy@rolltop.ignatz42.dyndns.org
e2a6759c4a Bug#19799 delimiter command not working correctly when sourcing a sql file 
- Use more appropriate test case.
 2006-11-22 01:27:06 -05:00
ramil/ram@myoffice.izhnet.ru
530325adec Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
 2006-11-22 10:10:55 +04:00
iggy@rolltop.ignatz42.dyndns.org
ef77a83bc2 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799
 2006-11-22 00:53:36 -05:00
iggy@rolltop.ignatz42.dyndns.org
26e05951ab Bug#19799 delimiter command not working correctly when sourcing a sql file 
- Post Merge Fix.
 2006-11-22 00:52:32 -05:00
ramil/ram@myoffice.izhnet.ru
5060fa10f8 Merge mysql.com:/usr/home/ram/work/bug22029/my50-bug22029 
into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
 2006-11-22 09:29:22 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0a415e360c Merge mysql.com:/usr/home/ram/work/bug22029/my41-bug22029 
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
 2006-11-22 09:19:51 +04:00
baker@bk-internal.mysql.com
098571df33 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-22 05:54:30 +01:00
iggy@rolltop.ignatz42.dyndns.org
dead0ccb9d Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799
 2006-11-21 21:10:54 -05:00
iggy@rolltop.ignatz42.dyndns.org
bface97ecc Bug#19799 delimiter command not working correctly when sourcing a sql file 
- Client side readline functions unconditionally search for Unix '\n' line
endings. In this case, the delimiter statement was set to '//\r' instead 
of the intended '//'. When removing the '\n' check for and remove 
preceeding '\r' character as well.
 2006-11-21 21:10:02 -05:00
lars@black.(none)
6a85cca986 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-11-22 02:24:16 +01:00
monty@nosik.monty.fi
38a92caeb7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-21 23:12:45 +02:00
msvensson@neptunus.(none)
53122d2be0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-21 21:46:00 +01:00
msvensson@neptunus.(none)
d89db5edf8 When runnig from binary dist the .sql files are found in share/ directory 2006-11-21 21:39:37 +01:00
monty@mysql.com/nosik.monty.fi
f6682e2743 Added --debug-info to most clients to detect memory leaks in mysql-test-run 
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
 2006-11-21 22:32:58 +02:00
malff/marcsql@weblab.(none)
bafbe2c7c7 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-11733_topdown
 2006-11-21 11:02:25 -07:00
msvensson@neptunus.(none)
7673a2d415 Update mysql_fix_privilege_tables.sql to handle upgrade from 5.0 while retaining 
old upgrade behaviour.
Add test for upgrade from 5.0.30
 2006-11-21 17:44:43 +01:00
msvensson@neptunus.(none)
0ed045f51d Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-21 16:54:44 +01:00
msvensson@neptunus.(none)
30088b9d23 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-21 16:51:47 +01:00
msvensson@neptunus.(none)
66e3c220c6 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-21 15:58:05 +01:00
kroki/tomash@moonlight.intranet
7cde1656e4 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159
 2006-11-21 17:37:57 +03:00
kroki/tomash@moonlight.intranet
0a36a6f382 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159
 2006-11-21 17:37:25 +03:00
msvensson@neptunus.(none)
7cf226de11 Rename system_mysql_db_fix.test to system_mysql_db_fix30020 as it tests 
mysql_fix_privilege_tables.s's ability to convert the system tables as of
3.20 to current system table format
Add similar test for 4.1.23 tables - but use "mysql < mysql_fix_privilege_tables.sql"
so it can be run on any platform.
 2006-11-21 15:31:11 +01:00
kroki/tomash@moonlight.intranet
f6235bc58c Update after merge. 
Use mutex when reading prepared_stmt_count global status variable.

Update test case for bug 16365 and bug 23159: add test for
prepared_stmt_count being decreased when some connection that had
prepared statements is closed.
 2006-11-21 17:23:54 +03:00