Commits · fdf84be52ce93b457c8b82731248b583b4c201a4 · nexedi / MariaDB

19 Mar, 2008 7 commits
- Merge trift2.:/MySQL/M50/push-5.0 · fdf84be5
  unknown authored Mar 19, 2008
```
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
```
  fdf84be5
- Merge trift2.:/MySQL/M50/man8-5.0 · 022215eb
  unknown authored Mar 19, 2008
```
into  trift2.:/MySQL/M51/man8-5.1


support-files/mysql.spec.sh:
  Auto merged
```
  022215eb
- Merge trift2.:/MySQL/M41/push-4.1 · e2a90030
  unknown authored Mar 19, 2008
```
into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Use local - version number changes don't propagate.
```
  e2a90030
- Merge trift2.:/MySQL/M41/man8-4.1 · 3976ca90
  unknown authored Mar 19, 2008
```
into  trift2.:/MySQL/M50/man8-5.0


support-files/mysql.spec.sh:
  Manual merge: Add the man pages for "ndbd" and "ndb_mgmd".
```
  3976ca90
- Merge trift2.:/MySQL/M41/man8-4.1 · bedfbac6
  unknown authored Mar 19, 2008
```
into  trift2.:/MySQL/M41/push-4.1
```
  bedfbac6
- support-files/mysql.spec.sh : Add the man pages for "ndbd" and "ndb_mgmd". · 3e9928c6
  unknown authored Mar 19, 2008
```
support-files/mysql.spec.sh:
  Add the man pages for "ndbd" and "ndb_mgmd".
```
  3e9928c6
- Merge trift2.:/MySQL/M41/mysql-4.1 · 1a40bf5a
  unknown authored Mar 19, 2008
```
into  trift2.:/MySQL/M41/push-4.1


configure.in:
  Auto merged
```
  1a40bf5a
17 Mar, 2008 1 commit
- Raise version number after cloning 4.1.24 · 3cf4d70e
  unknown authored Mar 18, 2008
  
  3cf4d70e
14 Mar, 2008 6 commits

Merge trift2.:/MySQL/M50/push-5.0 · 346c3625

unknown authored Mar 14, 2008

into  trift2.:/MySQL/M51/push-5.1


client/mysqldump.c:
  Auto merged
scripts/make_win_bin_dist:
  Auto merged

346c3625

Merge trift2.:/MySQL/M41/push-4.1 · 7fd69f2f
unknown authored Mar 14, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
7fd69f2f
Merge trift2.:/MySQL/M50/clone-5.0 · 767c6a2b
unknown authored Mar 14, 2008
```
into  trift2.:/MySQL/M50/push-5.0


scripts/make_win_bin_dist:
  Auto merged
```
767c6a2b

Merge trift2.:/MySQL/M51/mysql-5.1 · 532da5eb

unknown authored Mar 14, 2008

into  trift2.:/MySQL/M51/push-5.1


client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/unireg.h:
  Auto merged

532da5eb

Merge trift2.:/MySQL/M50/mysql-5.0 · ed86d34b
unknown authored Mar 14, 2008
```
into  trift2.:/MySQL/M50/push-5.0


client/mysqldump.c:
  Auto merged
```
ed86d34b
Merge trift2.:/MySQL/M41/mysql-4.1 · 5c3bb640
unknown authored Mar 14, 2008
```
into  trift2.:/MySQL/M41/push-4.1
```
5c3bb640

13 Mar, 2008 5 commits
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my50-bug34192 · 51f19844
  unknown authored Mar 13, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
```
  51f19844
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my51-bug34192 · 4baa2eb8
  unknown authored Mar 13, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build


client/mysqldump.c:
  Auto merged
```
  4baa2eb8
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my50-bug34192 · f1e546ac
  unknown authored Mar 13, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my51-bug34192


client/mysqldump.c:
  manual merge
```
  f1e546ac
- Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 269ebe54
  unknown authored Mar 13, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Null merge.
```
  269ebe54
- Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures · f20fe94b
  unknown authored Mar 13, 2008
```
  
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.


tests/mysql_client_test.c:
  Disable test case.
```
  f20fe94b
12 Mar, 2008 17 commits

Bug#34192: mysqldump from mysql 5.0.51 silently fails on dumping \ · a54e3fa2

unknown authored Mar 12, 2008

	databases from 4.0 server

mysqldump treated a failure to set the results charset as a severe
error.  

Now, don't try to set the charset for the SHOW CREATE TABLE statement,
if remote server's version is earlier than 4.1, which means it 
doesn't support changing charsets.


client/mysqldump.c:
  Don't set the charset for receiving results if the server doesn't 
  support it.

a54e3fa2

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26703/my51-bug26703 · 232481e4
unknown authored Mar 12, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
```
232481e4

Bug#26703: DROP DATABASE fails if database contains a #mysql50# \ · b5978a94

unknown authored Mar 12, 2008

	table with backticks

(Thanks to Lu Jingdong, though I did not take his patch directly, as
it contained a significant flaw.)

It wasn't a backtick/parsing problem.  We merely didn't anticipate
and allocate enough space to handle the optional "#mysql50#" table-
name prefix. 

Now, allocate that extra space in case we need it when we look up 
a legacy table to get its file's name.


mysql-test/r/drop.result:
  Verify that databases with old-style files can be removed.
mysql-test/t/drop.test:
  Verify that databases with old-style files can be removed.
sql/sql_db.cc:
  Extend the size of the memory that holds the table's name, so that
  the legacy "mysql50" prefix fits.

b5978a94

Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean · ad79dee0
unknown authored Mar 12, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
```
ad79dee0
Fixed test failures caused by insufficient cleanups in the tests for · 3155a88d
unknown authored Mar 12, 2008
```
bug12713.
```
3155a88d
Merge five.local.lan:/work/merge/mysql-5.1-funcs_1 · b5a8a8a1
unknown authored Mar 12, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
```
b5a8a8a1
Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 · 179f64dd
unknown authored Mar 12, 2008
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
179f64dd

Post merge fix for · 7c2a6ceb

unknown authored Mar 12, 2008

   ChangeSet@1.2565, 2008-03-11 20:20:49+01:00
     Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
     into  five.local.lan:/work/merge/mysql-5.1-funcs_1
     MERGE: 1.1810.3473.26

   ChangeSet@1.1810.3473.26, 2008-03-11 19:54:35+01:00
   Post fix for
   WL#4203 Reorganize and fix the data dictionary tests of
           testsuite funcs_1

The final fix of
Bug#34532 Some funcs_1 tests do not clean up at end of testing
   and some minor additional modifications are for
happens here


mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_bitdata.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_cursors.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_views.result:
  Updated results
mysql-test/suite/funcs_1/t/innodb_trig_03e.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_trig_03e.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_03e.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_bitdata.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_cursors.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_0102.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_03.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_03e.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_0407.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_08.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_09.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/t/ndb_views.test:
  Cleanup

7c2a6ceb

Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt · 6c2f9bf5

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged

6c2f9bf5

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 9fcf16a0
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Manual merge.
```
9fcf16a0
Post-merge fix. · fe846378
unknown authored Mar 12, 2008

fe846378
Re-enabled the test for mysql_insert_id() after merging from main. · 615db68d
unknown authored Mar 12, 2008

615db68d

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 69d49bca

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

69d49bca

Merge kaamos.(none):/data/src/mysql-5.1 · d6df18dd

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.
sql-common/client.c:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.

d6df18dd

Merge kaamos.(none):/data/src/opt/mysql-4.1-opt · 66507ba8
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
66507ba8

Merge kaamos.(none):/data/src/mysql-5.0 · 09f8a4af

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.0-opt


client/mysql.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.

09f8a4af

Merge kaamos.(none):/data/src/mysql-4.1 · 6dfe411c
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-4.1-opt
```
6dfe411c

11 Mar, 2008 4 commits

Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 · e61e4c2f

unknown authored Mar 11, 2008

into  five.local.lan:/work/merge/mysql-5.1-funcs_1


mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Auto merged
BitKeeper/deleted/.del-innodb_triggers.result:
  Auto merged
BitKeeper/deleted/.del-memory_triggers.result:
  Auto merged
BitKeeper/deleted/.del-myisam_triggers.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  manual merge
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  manual merge
mysql-test/suite/funcs_1/r/myisam_views.result:
  manual merge

e61e4c2f

Post fix for · 67d529ed

unknown authored Mar 11, 2008

WL#4203 Reorganize and fix the data dictionary tests of
        testsuite funcs_1
because the goal to fix
Bug#34532 Some funcs_1 tests do not clean up at end of testing
was partially missed.
Some minor additional modifications are for
   WL#4304 Cleanup in funcs_1 tests


BitKeeper/deleted/.del-innodb_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/innodb_triggers.result -> BitKeeper/deleted/.del-innodb_triggers.result
BitKeeper/deleted/.del-memory_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/memory_triggers.result -> BitKeeper/deleted/.del-memory_triggers.result
BitKeeper/deleted/.del-myisam_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/myisam_triggers.result -> BitKeeper/deleted/.del-myisam_triggers.result
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Cleanup
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/memory_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/views/views_master.inc:
  Backport of file in 5.1 which got many fixes for instabilities
  and other improvements

67d529ed

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 256df18e
unknown authored Mar 11, 2008
```
into  trift2.:/MySQL/M51/win-scripts-5.1


scripts/make_win_bin_dist:
  Auto merged
```
256df18e

Merge trift2.:/MySQL/M50/win-scripts-5.0 · 9f26f5c5

unknown authored Mar 11, 2008

into  trift2.:/MySQL/M51/win-scripts-5.1


scripts/CMakeLists.txt:
  "Use local" - the change was for 5.0 only,
  neither "mysql_tableinfo" nor "mysql_upgrade_shell" exist in 5.1
scripts/make_win_bin_dist:
  "Use local" - the change was for 5.0 only,
  neither "mysql_tableinfo" nor "mysql_upgrade_shell" exist in 5.1

9f26f5c5